Index: /issm/trunk/src/c/Container/Parameters.cpp =================================================================== --- /issm/trunk/src/c/Container/Parameters.cpp (revision 8599) +++ /issm/trunk/src/c/Container/Parameters.cpp (revision 8600) @@ -161,4 +161,22 @@ } /*}}}*/ +/*FUNCTION Parameters::FindParam(int** pintarray,int* pM,int* pN,int enum_type){{{1*/ +void Parameters::FindParam(int** pintarray,int* pM,int *pN,int enum_type){ _assert_(this); + + vector::iterator object; + Param* param=NULL; + + for ( object=objects.begin() ; object < objects.end(); object++ ){ + + param=(Param*)(*object); + if(param->EnumType()==enum_type){ + param->GetParameterValue(pintarray,pM,pN); + return; + } + } + _error_("could not find parameter %s",EnumToStringx(enum_type)); + +} +/*}}}*/ /*FUNCTION Parameters::FindParam(double** pdoublearray,int* pM,int enum_type){{{1*/ void Parameters::FindParam(double** pdoublearray,int* pM, int enum_type){ _assert_(this); @@ -352,4 +370,28 @@ } /*}}}*/ +/*FUNCTION Parameters::SetParam(int* intarray,int M,int enum_type);{{{1*/ +void Parameters::SetParam(int* intarray,int M, int enum_type){ + + Param* param=NULL; + + /*first, figure out if the param has already been created: */ + param=(Param*)this->FindParamObject(enum_type); + + if(param) param->SetValue(intarray,M); //already exists, just set it. + else this->AddObject(new IntVecParam(enum_type,intarray,M)); //just add the new parameter. +} +/*}}}*/ +/*FUNCTION Parameters::SetParam(int* intarray,int M,int N, int enum_type);{{{1*/ +void Parameters::SetParam(int* intarray,int M, int N, int enum_type){ + + Param* param=NULL; + + /*first, figure out if the param has already been created: */ + param=(Param*)this->FindParamObject(enum_type); + + if(param) param->SetValue(intarray,M,N); //already exists, just set it. + else this->AddObject(new IntMatParam(enum_type,intarray,M,N)); //just add the new parameter. +} +/*}}}*/ /*FUNCTION Parameters::SetParam(Vec vector,int enum_type);{{{1*/ void Parameters::SetParam(Vec vector,int enum_type){ Index: /issm/trunk/src/c/Container/Parameters.h =================================================================== --- /issm/trunk/src/c/Container/Parameters.h (revision 8599) +++ /issm/trunk/src/c/Container/Parameters.h (revision 8600) @@ -34,4 +34,5 @@ void FindParam(char*** pstringarray,int* pM,int enum_type); void FindParam(int** pintarray,int* pM,int enum_type); + void FindParam(int** pintarray,int* pM,int* PN,int enum_type); void FindParam(double** pdoublearray,int* pM,int enum_type); void FindParam(double** pdoublearray,int* pM,int* pN,int enum_type); @@ -48,4 +49,6 @@ void SetParam(double* doublearray,int M,int enum_type); void SetParam(double* doublearray,int M,int N,int enum_type); + void SetParam(int* intarray,int M,int enum_type); + void SetParam(int* intarray,int M,int N,int enum_type); void SetParam(Vec vec,int enum_type); void SetParam(Mat mat,int enum_type); Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 8599) +++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 8600) @@ -456,5 +456,8 @@ ThicknessAbsGradientEnum, VelAbsGradientEnum, - DatasetInputEnum + DatasetInputEnum, + NumResponsesEnum, + StepResponsesEnum, + IntMatParamEnum }; Index: /issm/trunk/src/c/Makefile.am =================================================================== --- /issm/trunk/src/c/Makefile.am (revision 8599) +++ /issm/trunk/src/c/Makefile.am (revision 8600) @@ -255,4 +255,6 @@ ./objects/Params/IntVecParam.cpp\ ./objects/Params/IntVecParam.h\ + ./objects/Params/IntMatParam.cpp\ + ./objects/Params/IntMatParam.h\ ./objects/Params/DoubleParam.cpp\ ./objects/Params/DoubleParam.h\ @@ -924,4 +926,6 @@ ./objects/Params/IntVecParam.cpp\ ./objects/Params/IntVecParam.h\ + ./objects/Params/IntMatParam.cpp\ + ./objects/Params/IntMatParam.h\ ./objects/Params/DoubleParam.cpp\ ./objects/Params/DoubleParam.h\ Index: /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp =================================================================== --- /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 8599) +++ /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 8600) @@ -400,4 +400,7 @@ case VelAbsGradientEnum : return "VelAbsGradient"; case DatasetInputEnum : return "DatasetInput"; + case NumResponsesEnum : return "NumResponses"; + case StepResponsesEnum : return "StepResponses"; + case IntMatParamEnum : return "IntMatParam"; default : return "unknown"; Index: /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp =================================================================== --- /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 8599) +++ /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 8600) @@ -398,4 +398,7 @@ else if (strcmp(name,"VelAbsGradient")==0) return VelAbsGradientEnum; else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum; + else if (strcmp(name,"NumResponses")==0) return NumResponsesEnum; + else if (strcmp(name,"StepResponses")==0) return StepResponsesEnum; + else if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum; else _error_("Enum %s not found",name); Index: /issm/trunk/src/c/objects/Params/BoolParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/BoolParam.h (revision 8599) +++ /issm/trunk/src/c/objects/Params/BoolParam.h (revision 8600) @@ -52,4 +52,5 @@ void GetParameterValue(int* pinteger){_error_("Bool param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} void GetParameterValue(int** pintarray,int* pM){_error_("Bool param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int** pintarray,int* pM,int* pN){_error_("Bool param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} void GetParameterValue(double* pdouble){_error_("Bool param of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} void GetParameterValue(char** pstring){_error_("Bool param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} @@ -64,5 +65,4 @@ void SetValue(bool boolean){this->value=boolean;} void SetValue(int integer){this->value=(bool)integer;} - void SetValue(int* intarray,int M){_error_("Bool param of enum %i (%s) cannot hold an int array",enum_type,EnumToStringx(enum_type));} void SetValue(double scalar){this->value=(bool)scalar;} void SetValue(char* string){_error_("Bool param of enum %i (%s) cannot hold a string",enum_type,EnumToStringx(enum_type));} @@ -70,4 +70,6 @@ void SetValue(double* doublearray,int M){_error_("Bool param of enum %i (%s) cannot hold a double array",enum_type,EnumToStringx(enum_type));} void SetValue(double* pdoublearray,int M,int N){_error_("Bool param of enum %i (%s) cannot hold a double array",enum_type,EnumToStringx(enum_type));} + void SetValue(int* intarray,int M){_error_("Bool param of enum %i (%s) cannot hold a int array",enum_type,EnumToStringx(enum_type));} + void SetValue(int* pintarray,int M,int N){_error_("Bool param of enum %i (%s) cannot hold a int array",enum_type,EnumToStringx(enum_type));} void SetValue(Vec vec){_error_("Bool param of enum %i (%s) cannot hold a Vec",enum_type,EnumToStringx(enum_type));} void SetValue(Mat mat){_error_("Bool param of enum %i (%s) cannot hold a Mat",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk/src/c/objects/Params/DoubleMatArrayParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleMatArrayParam.h (revision 8599) +++ /issm/trunk/src/c/objects/Params/DoubleMatArrayParam.h (revision 8600) @@ -55,4 +55,5 @@ void GetParameterValue(int* pinteger){_error_("DoubleMatArray param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} void GetParameterValue(int** pintarray,int* pM){_error_("DoubleMatArray param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int** pintarray,int* pM,int* pN){_error_("DoubleMatArray param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} void GetParameterValue(double* pdouble){_error_("DoubleMatArray param of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} void GetParameterValue(char** pstring){_error_("DoubleMatArray param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} @@ -67,5 +68,4 @@ void SetValue(bool boolean){_error_("DoubleMatArray param of enum %i (%s) cannot hold a boolean",enum_type,EnumToStringx(enum_type));} void SetValue(int integer){_error_("DoubleMatArray param of enum %i (%s) cannot hold an integer",enum_type,EnumToStringx(enum_type));} - void SetValue(int* intarray,int M){_error_("DoubleMatArray param of enum %i (%s) cannot hold an int array",enum_type,EnumToStringx(enum_type));} void SetValue(double scalar){_error_("DoubleMatArray param of enum %i (%s) cannot hold a scalar",enum_type,EnumToStringx(enum_type));} void SetValue(char* string){_error_("DoubleMatArray param of enum %i (%s) cannot hold a string",enum_type,EnumToStringx(enum_type));} @@ -73,4 +73,6 @@ void SetValue(double* doublearray,int M){_error_("DoubleMatArray param of enum %i (%s) cannot hold a double vec array",enum_type,EnumToStringx(enum_type));} void SetValue(double* doublearray,int M,int N){_error_("DoubleMatArray param of enum %i (%s) cannot hold a double mat array",enum_type,EnumToStringx(enum_type));} + void SetValue(int* intarray,int M){_error_("DoubleMatArray param of enum %i (%s) cannot hold a int vec array",enum_type,EnumToStringx(enum_type));} + void SetValue(int* intarray,int M,int N){_error_("DoubleMatArray param of enum %i (%s) cannot hold a int mat array",enum_type,EnumToStringx(enum_type));} void SetValue(Vec vec){_error_("DoubleMatArray param of enum %i (%s) cannot hold a Vec",enum_type,EnumToStringx(enum_type));} void SetValue(Mat mat){_error_("DoubleMatArray param of enum %i (%s) cannot hold a Mat",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk/src/c/objects/Params/DoubleMatParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleMatParam.h (revision 8599) +++ /issm/trunk/src/c/objects/Params/DoubleMatParam.h (revision 8600) @@ -54,4 +54,5 @@ void GetParameterValue(int* pinteger){_error_("DoubleMat param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} void GetParameterValue(int** pintarray,int* pM){_error_("DoubleMat param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int** pintarray,int* pM,int* pN){_error_("DoubleMat param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} void GetParameterValue(double* pdouble){_error_("DoubleMat param of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} void GetParameterValue(char** pstring){_error_("DoubleMat param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} @@ -66,5 +67,4 @@ void SetValue(bool boolean){_error_("DoubleMat param of enum %i (%s) cannot hold a boolean",enum_type,EnumToStringx(enum_type));} void SetValue(int integer){_error_("DoubleMat param of enum %i (%s) cannot hold an integer",enum_type,EnumToStringx(enum_type));} - void SetValue(int* intarray,int M){_error_("DoubleMat param of enum %i (%s) cannot hold an int array",enum_type,EnumToStringx(enum_type));} void SetValue(double scalar){_error_("DoubleMat param of enum %i (%s) cannot hold a scalar",enum_type,EnumToStringx(enum_type));} void SetValue(char* string){_error_("DoubleMat param of enum %i (%s) cannot hold a string",enum_type,EnumToStringx(enum_type));} @@ -72,4 +72,6 @@ void SetValue(double* doublearray,int M){_error_("DoubleMat param of enum %i (%s) cannot hold a double vec array",enum_type,EnumToStringx(enum_type));} void SetValue(double* doublearray,int M,int N); + void SetValue(int* intarray,int M){_error_("DoubleMat param of enum %i (%s) cannot hold a int vec array",enum_type,EnumToStringx(enum_type));} + void SetValue(int* intarray,int M,int N){_error_("DoubleMat param of enum %i (%s) cannot hold a int mat array",enum_type,EnumToStringx(enum_type));}; void SetValue(Vec vec){_error_("DoubleMat param of enum %i (%s) cannot hold a Vec",enum_type,EnumToStringx(enum_type));} void SetValue(Mat mat){_error_("DoubleMat param of enum %i (%s) cannot hold a Mat",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk/src/c/objects/Params/DoubleParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleParam.cpp (revision 8599) +++ /issm/trunk/src/c/objects/Params/DoubleParam.cpp (revision 8600) @@ -167,4 +167,21 @@ } /*}}}*/ +/*FUNCTION DoubleParam::GetParameterValue(int** pintarray,int* pM,int* pN){{{1*/ +void DoubleParam::GetParameterValue(int** pintarray,int* pM,int* pN){ +#ifdef _SERIAL_ + int* output=NULL; + + output=(int*)xmalloc(1*sizeof(int)); + *output=(int)value; + + /*Assign output pointers:*/ + if(pM) *pM=1; + if(pN) *pN=1; + *pintarray=output; +#else + _error_("Double param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type)); +#endif +} +/*}}}*/ /*FUNCTION DoubleParam::GetParameterValue(double** pdoublearray,int* pM){{{1*/ void DoubleParam::GetParameterValue(double** pdoublearray,int* pM){ Index: /issm/trunk/src/c/objects/Params/DoubleParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleParam.h (revision 8599) +++ /issm/trunk/src/c/objects/Params/DoubleParam.h (revision 8600) @@ -53,4 +53,5 @@ void GetParameterValue(int* pinteger); void GetParameterValue(int** pintarray,int* pM); + void GetParameterValue(int** pintarray,int* pM,int* pN); void GetParameterValue(double* pdouble){*pdouble=value;} void GetParameterValue(char** pstring){_error_("Double param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} @@ -65,5 +66,4 @@ void SetValue(bool boolean){this->value=(double)boolean;} void SetValue(int integer){this->value=(double)integer;} - void SetValue(int* intarray,int M){_error_("Double param of enum %i (%s) cannot hold an int array",enum_type,EnumToStringx(enum_type));} void SetValue(double scalar){this->value=(double)scalar;} void SetValue(char* string){_error_("Double param of enum %i (%s) cannot hold a string",enum_type,EnumToStringx(enum_type));} @@ -71,4 +71,6 @@ void SetValue(double* doublearray,int M){_error_("Double param of enum %i (%s) cannot hold a double array",enum_type,EnumToStringx(enum_type));} void SetValue(double* pdoublearray,int M,int N){_error_("Double param of enum %i (%s) cannot hold a double array",enum_type,EnumToStringx(enum_type));} + void SetValue(int* intarray,int M){_error_("Double param of enum %i (%s) cannot hold a int array",enum_type,EnumToStringx(enum_type));} + void SetValue(int* pintarray,int M,int N){_error_("Double param of enum %i (%s) cannot hold a int array",enum_type,EnumToStringx(enum_type));} void SetValue(Vec vec){_error_("Double param of enum %i (%s) cannot hold a Vec",enum_type,EnumToStringx(enum_type));} void SetValue(Mat mat){_error_("Double param of enum %i (%s) cannot hold a Mat",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk/src/c/objects/Params/DoubleVecParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleVecParam.h (revision 8599) +++ /issm/trunk/src/c/objects/Params/DoubleVecParam.h (revision 8600) @@ -53,4 +53,5 @@ void GetParameterValue(int* pinteger){_error_("DoubleVec param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} void GetParameterValue(int** pintarray,int* pM); + void GetParameterValue(int** pintarray,int* pM,int* pN){_error_("DoubleMat param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));}; void GetParameterValue(double* pdouble){_error_("DoubleVec param of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} void GetParameterValue(char** pstring){_error_("DoubleVec param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} @@ -65,5 +66,4 @@ void SetValue(bool boolean){_error_("DoubleVec param of enum %i (%s) cannot hold a boolean",enum_type,EnumToStringx(enum_type));} void SetValue(int integer){_error_("DoubleVec param of enum %i (%s) cannot hold an integer",enum_type,EnumToStringx(enum_type));} - void SetValue(int* intarray,int M){_error_("DoubleVec param of enum %i (%s) cannot hold an int array",enum_type,EnumToStringx(enum_type));} void SetValue(double scalar){_error_("DoubleVec param of enum %i (%s) cannot hold a scalar",enum_type,EnumToStringx(enum_type));} void SetValue(char* string){_error_("DoubleVec param of enum %i (%s) cannot hold a string",enum_type,EnumToStringx(enum_type));} @@ -71,4 +71,6 @@ void SetValue(double* doublearray,int M); void SetValue(double* pdoublearray,int M,int N){_error_("DoubleVec param of enum %i (%s) cannot hold a double mat array",enum_type,EnumToStringx(enum_type));} + void SetValue(int* intarray,int M){_error_("DoubleVec param of enum %i (%s) cannot hold a int mat array",enum_type,EnumToStringx(enum_type));}; + void SetValue(int* pintarray,int M,int N){_error_("DoubleVec param of enum %i (%s) cannot hold a int mat array",enum_type,EnumToStringx(enum_type));} void SetValue(Vec vec){_error_("DoubleVec param of enum %i (%s) cannot hold a Vec",enum_type,EnumToStringx(enum_type));} void SetValue(Mat mat){_error_("DoubleVec param of enum %i (%s) cannot hold a Mat",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk/src/c/objects/Params/FileParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/FileParam.h (revision 8599) +++ /issm/trunk/src/c/objects/Params/FileParam.h (revision 8600) @@ -52,4 +52,5 @@ void GetParameterValue(int* pinteger){_error_("FileParam of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} void GetParameterValue(int** pintarray,int* pM){_error_("FileParam of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int** pintarray,int* pM,int* pN){_error_("FileParam of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} void GetParameterValue(double* pdouble){_error_("FileParam of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} void GetParameterValue(char** pstring){_error_("FileParam of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} @@ -64,5 +65,4 @@ void SetValue(bool boolean){_error_("FileParam of enum %i (%s) cannot hold a string",enum_type,EnumToStringx(enum_type));} void SetValue(int integer){_error_("FileParam of enum %i (%s) cannot hold a string",enum_type,EnumToStringx(enum_type));} - void SetValue(int* intarray,int M){_error_("FileParam of enum %i (%s) cannot hold a string",enum_type,EnumToStringx(enum_type));} void SetValue(double scalar){_error_("FileParam of enum %i (%s) cannot hold a string",enum_type,EnumToStringx(enum_type));} void SetValue(char* string){_error_("FileParam of enum %i (%s) cannot hold a string",enum_type,EnumToStringx(enum_type));} @@ -70,4 +70,6 @@ void SetValue(double* doublearray,int M){_error_("FileParam of enum %i (%s) cannot hold a double array",enum_type,EnumToStringx(enum_type));} void SetValue(double* pdoublearray,int M,int N){_error_("FileParam of enum %i (%s) cannot hold a double array",enum_type,EnumToStringx(enum_type));} + void SetValue(int* intarray,int M){_error_("FileParam of enum %i (%s) cannot hold a int array",enum_type,EnumToStringx(enum_type));} + void SetValue(int* pintarray,int M,int N){_error_("FileParam of enum %i (%s) cannot hold a int array",enum_type,EnumToStringx(enum_type));} void SetValue(Vec vec){_error_("FileParam of enum %i (%s) cannot hold a Vec",enum_type,EnumToStringx(enum_type));} void SetValue(Mat mat){_error_("FileParam of enum %i (%s) cannot hold a Mat",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk/src/c/objects/Params/IntMatParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/IntMatParam.cpp (revision 8600) +++ /issm/trunk/src/c/objects/Params/IntMatParam.cpp (revision 8600) @@ -0,0 +1,213 @@ +/*!\file IntMatParam.c + * \brief: implementation of the IntMatParam object + */ + +/*header files: */ +/*{{{1*/ +#ifdef HAVE_CONFIG_H + #include "config.h" +#else +#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +#endif + +#include "stdio.h" +#include +#include "../objects.h" +#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/shared.h" +#include "../../Container/Container.h" +#include "../../include/include.h" +/*}}}*/ + +/*IntMatParam constructors and destructor*/ +/*FUNCTION IntMatParam::IntMatParam(){{{1*/ +IntMatParam::IntMatParam(){ + return; +} +/*}}}*/ +/*FUNCTION IntMatParam::IntMatParam(int enum_type,IssmIntMat value){{{1*/ +IntMatParam::IntMatParam(int in_enum_type,int* in_value, int in_M,int in_N){ + + enum_type=in_enum_type; + M=in_M; + N=in_N; + + value=(int*)xmalloc(M*N*sizeof(int)); + memcpy(value,in_value,M*N*sizeof(int)); +} +/*}}}*/ +/*FUNCTION IntMatParam::~IntMatParam(){{{1*/ +IntMatParam::~IntMatParam(){ + xfree((void**)&value); + return; +} +/*}}}*/ + +/*Object virtual functions definitions:*/ +/*FUNCTION IntMatParam::Echo {{{1*/ +void IntMatParam::Echo(void){ + + printf("IntMatParam:\n"); + printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); + printf(" matrix size: %ix%i\n",this->M,this->N); + +} +/*}}}*/ +/*FUNCTION IntMatParam::DeepEcho{{{1*/ +void IntMatParam::DeepEcho(void){ + + int i,j; + + printf("IntMatParam:\n"); + printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); + printf(" matrix size: %ix%i\n",this->M,this->N); + for(i=0;iM;i++){ + for(i=0;iN;i++){ + printf("%i %i %g\n",i,j,*(this->value+N*i+j)); + } + } +} +/*}}}*/ +/*FUNCTION IntMatParam::Id{{{1*/ +int IntMatParam::Id(void){ return -1; } +/*}}}*/ +/*FUNCTION IntMatParam::MyRank{{{1*/ +int IntMatParam::MyRank(void){ + extern int my_rank; + return my_rank; +} +/*}}}*/ +/*FUNCTION IntMatParam::Marshall{{{1*/ +void IntMatParam::Marshall(char** pmarshalled_dataset){ + + char* marshalled_dataset=NULL; + int enum_value=0; + + /*recover marshalled_dataset: */ + marshalled_dataset=*pmarshalled_dataset; + + /*get enum value of IntMatParam: */ + enum_value=IntMatParamEnum; + + /*marshall enum: */ + memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); + + /*marshall IntMatParam data: */ + memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); + memcpy(marshalled_dataset,&M,sizeof(M));marshalled_dataset+=sizeof(M); + memcpy(marshalled_dataset,&N,sizeof(N));marshalled_dataset+=sizeof(N); + memcpy(marshalled_dataset,value,M*N*sizeof(int));marshalled_dataset+=M*N*sizeof(int); + + *pmarshalled_dataset=marshalled_dataset; +} +/*}}}*/ +/*FUNCTION IntMatParam::MarshallSize{{{1*/ +int IntMatParam::MarshallSize(){ + + return sizeof(M) + +sizeof(N) + +M*N*sizeof(int) + +sizeof(enum_type)+ + +sizeof(int); //sizeof(int) for enum value +} +/*}}}*/ +/*FUNCTION IntMatParam::Demarshall{{{1*/ +void IntMatParam::Demarshall(char** pmarshalled_dataset){ + + char* marshalled_dataset=NULL; + int i; + + /*recover marshalled_dataset: */ + marshalled_dataset=*pmarshalled_dataset; + + /*this time, no need to get enum type, the pointer directly points to the beginning of the + *object data (thanks to DataSet::Demarshall):*/ + memcpy(&enum_type,marshalled_dataset,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); + + /*data: */ + memcpy(&M,marshalled_dataset,sizeof(M));marshalled_dataset+=sizeof(M); + memcpy(&N,marshalled_dataset,sizeof(N));marshalled_dataset+=sizeof(N); + value=(int*)xmalloc(M*N*sizeof(int)); + memcpy(value,marshalled_dataset,M*N*sizeof(int));marshalled_dataset+=M*N*sizeof(int); + + /*return: */ + *pmarshalled_dataset=marshalled_dataset; + return; +} +/*}}}*/ +/*FUNCTION IntMatParam::Enum{{{1*/ +int IntMatParam::Enum(void){ + + return IntMatParamEnum; + +} +/*}}}*/ +/*FUNCTION IntMatParam::copy{{{1*/ +Object* IntMatParam::copy() { + + return new IntMatParam(this->enum_type,this->value,this->M,this->N); + +} +/*}}}*/ + +/*IntMatParam virtual functions definitions: */ +/*FUNCTION IntMatParam::GetParameterValue{{{1*/ +void IntMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){ + int* output=NULL; + + output=(int*)xmalloc((int)(M*N*sizeof(int))); + memcpy(output,value,M*N*sizeof(int)); + + /*Assign output pointers:*/ + if(pM) *pM=M; + if(pN) *pN=N; + *pintarray=output; +} +/*}}}*/ +/*FUNCTION IntMatParam::GetParameterName{{{1*/ +char* IntMatParam::GetParameterName(void){ + return EnumToStringx(this->enum_type); +} +/*}}}*/ +/*FUNCTION IntMatParam::SetMatlabField{{{1*/ +#ifdef _SERIAL_ +void IntMatParam::SetMatlabField(mxArray* dataref){ + + char *name = NULL; + double *doublearray = NULL; + int *intarray = NULL; + mxArray *pfield = NULL; + mxArray *pfield2 = NULL; + + this->GetParameterValue(&intarray,NULL,NULL); + name=this->GetParameterName(); + + /*cast intarray into doublearray for Matlab*/ + doublearray=(double*)xmalloc(M*N*sizeof(double)); + for(int i=0;ivalue); + + this->value=(int*)xmalloc(in_M*in_N*sizeof(int)); + memcpy(this->value,intarray,in_M*in_N*sizeof(int)); + + this->M=in_M; + this->N=in_N; +} +/*}}}*/ Index: /issm/trunk/src/c/objects/Params/IntMatParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/IntMatParam.h (revision 8600) +++ /issm/trunk/src/c/objects/Params/IntMatParam.h (revision 8600) @@ -0,0 +1,88 @@ +/*! \file IntMatParam.h + * \brief: header file for triavertexinput object + */ + + +#ifndef _INTMATPARAM_H_ +#define _INTMATPARAM_H_ + +/*Headers:*/ +/*{{{1*/ +#ifdef HAVE_CONFIG_H + #include "config.h" +#else +#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +#endif + +#ifdef _SERIAL_ +#include +#endif + +#include "./Param.h" +#include "../../include/include.h" +#include "../../shared/shared.h" +/*}}}*/ + +class IntMatParam: public Param{ + + private: + int enum_type; + int* value; + int M; + int N; + + public: + /*IntMatParam constructors, destructors: {{{1*/ + IntMatParam(); + IntMatParam(int enum_type,int* value,int M,int N); + ~IntMatParam(); + /*}}}*/ + /*Object virtual functions definitions:{{{1 */ + void Echo(); + void DeepEcho(); + int Id(); + int MyRank(); + void Marshall(char** pmarshalled_dataset); + int MarshallSize(); + void Demarshall(char** pmarshalled_dataset); + int Enum(); + Object* copy(); + /*}}}*/ + /*Param vritual function definitions: {{{1*/ + int EnumType(){return enum_type;} + void GetParameterValue(bool* pbool){_error_("IntMat param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int* pinteger){_error_("IntMat param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int** pintarray,int* pM){_error_("IntMat param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int** pintarray,int* pM,int* pN); + void GetParameterValue(double* pdouble){_error_("IntMat param of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(char** pstring){_error_("IntMat param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(char*** pstringarray,int* pM){_error_("IntMat param of enum %i (%s) cannot return a string arrayl",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double** pdoublearray,int* pM){_error_("IntMat param of enum %i (%s) cannot return a double array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double** pdoublearray,int* pM,int* pN){_error_("IntMat param of enum %i (%s) cannot return a matrix array",enum_type,EnumToStringx(enum_type));}; + void GetParameterValue(double*** parray, int* pM,int** pmdims, int** pndims){_error_("IntMat param of enum %i (%s) cannot return a matrix array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(Vec* pvec){_error_("IntMat param of enum %i (%s) cannot return a Vec",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(Mat* pmat){_error_("IntMat param of enum %i (%s) cannot return a Mat",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(FILE** pfid){_error_("IntMat param of enum %i (%s) cannot return a FILE",enum_type,EnumToStringx(enum_type));} + + void SetValue(bool boolean){_error_("IntMat param of enum %i (%s) cannot hold a boolean",enum_type,EnumToStringx(enum_type));} + void SetValue(int integer){_error_("IntMat param of enum %i (%s) cannot hold an integer",enum_type,EnumToStringx(enum_type));} + void SetValue(double scalar){_error_("IntMat param of enum %i (%s) cannot hold a scalar",enum_type,EnumToStringx(enum_type));} + void SetValue(char* string){_error_("IntMat param of enum %i (%s) cannot hold a string",enum_type,EnumToStringx(enum_type));} + void SetValue(char** stringarray,int M){_error_("IntMat param of enum %i (%s) cannot hold a string array",enum_type,EnumToStringx(enum_type));} + void SetValue(double* doublearray,int M){_error_("IntMat param of enum %i (%s) cannot hold a double vec array",enum_type,EnumToStringx(enum_type));} + void SetValue(double* doublearray,int M,int N){_error_("IntMat param of enum %i (%s) cannot hold a double vec array",enum_type,EnumToStringx(enum_type));}; + void SetValue(int* intarray,int M){_error_("IntMat param of enum %i (%s) cannot hold a int vec array",enum_type,EnumToStringx(enum_type));}; + void SetValue(int* intarray,int M,int N); + void SetValue(Vec vec){_error_("IntMat param of enum %i (%s) cannot hold a Vec",enum_type,EnumToStringx(enum_type));} + void SetValue(Mat mat){_error_("IntMat param of enum %i (%s) cannot hold a Mat",enum_type,EnumToStringx(enum_type));} + void SetValue(FILE* fid){_error_("IntMat param of enum %i (%s) cannot hold a FILE",enum_type,EnumToStringx(enum_type));} + void SetValue(double** array, int M, int* mdim_array, int* ndim_array){_error_("IntMat param of enum %i (%s) cannot hold an array of matrices",enum_type,EnumToStringx(enum_type));} + + char* GetParameterName(void); + #ifdef _SERIAL_ + void SetMatlabField(mxArray* dataref); + #endif + + /*}}}*/ +}; +#endif /* _INTMATPARAM_H */ Index: /issm/trunk/src/c/objects/Params/IntParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/IntParam.h (revision 8599) +++ /issm/trunk/src/c/objects/Params/IntParam.h (revision 8600) @@ -53,4 +53,5 @@ void GetParameterValue(int* pinteger){*pinteger=value;} void GetParameterValue(int** pintarray,int* pM){_error_("Int param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int** pintarray,int* pM,int* pN){_error_("Int param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} void GetParameterValue(double* pdouble){_error_("Int param of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} void GetParameterValue(char** pstring){_error_("Int param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} @@ -66,4 +67,5 @@ void SetValue(int integer){this->value=integer;} void SetValue(int* intarray,int M){_error_("Int param of enum %i (%s) cannot hold an int array",enum_type,EnumToStringx(enum_type));} + void SetValue(int* intarray,int M,int N){_error_("Int param of enum %i (%s) cannot hold an int array",enum_type,EnumToStringx(enum_type));} void SetValue(double scalar){this->value=(int)scalar;} void SetValue(char* string){_error_("Int param of enum %i (%s) cannot hold a string",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk/src/c/objects/Params/IntVecParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/IntVecParam.h (revision 8599) +++ /issm/trunk/src/c/objects/Params/IntVecParam.h (revision 8600) @@ -54,4 +54,5 @@ void GetParameterValue(int* pinteger){_error_("IntVec param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} void GetParameterValue(int** pintarray,int* pM); + void GetParameterValue(int** pintarray,int* pM,int* pN){_error_("IntVec param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} void GetParameterValue(double* pdouble){_error_("IntVec param of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} void GetParameterValue(char** pstring){_error_("IntVec param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} @@ -66,5 +67,4 @@ void SetValue(bool boolean){_error_("IntVec param of enum %i (%s) cannot hold a boolean",enum_type,EnumToStringx(enum_type));} void SetValue(int integer){_error_("IntVec param of enum %i (%s) cannot hold an integer",enum_type,EnumToStringx(enum_type));} - void SetValue(int* intarray,int M); void SetValue(double scalar){_error_("IntVec param of enum %i (%s) cannot hold a scalar",enum_type,EnumToStringx(enum_type));} void SetValue(char* string){_error_("IntVec param of enum %i (%s) cannot hold a string",enum_type,EnumToStringx(enum_type));} @@ -72,4 +72,6 @@ void SetValue(double* doublearray,int M){_error_("IntVec param of enum %i (%s) cannot hold a double mat array",enum_type,EnumToStringx(enum_type));} void SetValue(double* pdoublearray,int M,int N){_error_("IntVec param of enum %i (%s) cannot hold a double mat array",enum_type,EnumToStringx(enum_type));} + void SetValue(int* intarray,int M); + void SetValue(int* pintarray,int M,int N){_error_("IntVec param of enum %i (%s) cannot hold a int mat array",enum_type,EnumToStringx(enum_type));} void SetValue(Vec vec){_error_("IntVec param of enum %i (%s) cannot hold a Vec",enum_type,EnumToStringx(enum_type));} void SetValue(Mat mat){_error_("IntVec param of enum %i (%s) cannot hold a Mat",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk/src/c/objects/Params/Param.h =================================================================== --- /issm/trunk/src/c/objects/Params/Param.h (revision 8599) +++ /issm/trunk/src/c/objects/Params/Param.h (revision 8600) @@ -29,9 +29,10 @@ virtual ~Param(){}; - /*Virtual functions:{{{1*/ + /*Virtual functions:*/ virtual int EnumType()=0; virtual void GetParameterValue(bool* pbool)=0; virtual void GetParameterValue(int* pinteger)=0; virtual void GetParameterValue(int** pintarray,int* pM)=0; + virtual void GetParameterValue(int** pintarray,int* pM,int* pN)=0; virtual void GetParameterValue(double* pdouble)=0; virtual void GetParameterValue(char** pstring)=0; @@ -46,5 +47,4 @@ virtual void SetValue(bool boolean)=0; virtual void SetValue(int integer)=0; - virtual void SetValue(int* intarray,int M)=0; virtual void SetValue(double scalar)=0; virtual void SetValue(char* string)=0; @@ -52,4 +52,6 @@ virtual void SetValue(double* doublearray,int M)=0; virtual void SetValue(double* pdoublearray,int M,int N)=0; + virtual void SetValue(int* intarray,int M)=0; + virtual void SetValue(int* pintarray,int M,int N)=0; virtual void SetValue(Vec vec)=0; virtual void SetValue(Mat mat)=0; @@ -61,6 +63,4 @@ virtual void SetMatlabField(mxArray* dataref)=0; #endif - /*}}}*/ - }; #endif Index: /issm/trunk/src/c/objects/Params/PetscMatParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/PetscMatParam.h (revision 8599) +++ /issm/trunk/src/c/objects/Params/PetscMatParam.h (revision 8600) @@ -53,4 +53,5 @@ void GetParameterValue(int* pinteger){_error_("PetscMat param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} void GetParameterValue(int** pintarray,int* pM){_error_("PetscMat param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int** pintarray,int* pM,int* pN){_error_("PetscMat param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} void GetParameterValue(double* pdouble){_error_("PetscMat param of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} void GetParameterValue(char** pstring){_error_("PetscMat param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} @@ -65,5 +66,4 @@ void SetValue(bool boolean){_error_("PetscMat param of enum %i (%s) cannot hold a boolean",enum_type,EnumToStringx(enum_type));} void SetValue(int integer){_error_("PetscMat param of enum %i (%s) cannot hold an integer",enum_type,EnumToStringx(enum_type));} - void SetValue(int* intarray,int M){_error_("PetscMat param of enum %i (%s) cannot hold an int array",enum_type,EnumToStringx(enum_type));} void SetValue(double scalar){_error_("PetscMat param of enum %i (%s) cannot hold a scalar",enum_type,EnumToStringx(enum_type));} void SetValue(char* string){_error_("PetscMat param of enum %i (%s) cannot hold a string",enum_type,EnumToStringx(enum_type));} @@ -71,4 +71,6 @@ void SetValue(double* doublearray,int M){_error_("PetscMat param of enum %i (%s) cannot hold a double array",enum_type,EnumToStringx(enum_type));} void SetValue(double* pdoublearray,int M,int N){_error_("PetscMat param of enum %i (%s) cannot hold a double array",enum_type,EnumToStringx(enum_type));} + void SetValue(int* intarray,int M){_error_("PetscMat param of enum %i (%s) cannot hold a int array",enum_type,EnumToStringx(enum_type));} + void SetValue(int* pintarray,int M,int N){_error_("PetscMat param of enum %i (%s) cannot hold a int array",enum_type,EnumToStringx(enum_type));} void SetValue(Vec vec){_error_("PetscMat param of enum %i (%s) cannot hold a Vec",enum_type,EnumToStringx(enum_type));} void SetValue(Mat mat); Index: /issm/trunk/src/c/objects/Params/PetscVecParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/PetscVecParam.h (revision 8599) +++ /issm/trunk/src/c/objects/Params/PetscVecParam.h (revision 8600) @@ -53,4 +53,5 @@ void GetParameterValue(int* pinteger){_error_("PetscVec param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} void GetParameterValue(int** pintarray,int* pM){_error_("PetscVec param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int** pintarray,int* pM,int* pN){_error_("PetscVec param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} void GetParameterValue(double* pdouble){_error_("PetscVec param of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} void GetParameterValue(char** pstring){_error_("PetscVec param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} @@ -65,5 +66,4 @@ void SetValue(bool boolean){_error_("PetscVec of enum %i (%s) cannot hold a boolean",enum_type,EnumToStringx(enum_type));} void SetValue(int integer){_error_("PetscVec of enum %i (%s) cannot hold an integer",enum_type,EnumToStringx(enum_type));} - void SetValue(int* intarray,int M){_error_("PetscVec of enum %i (%s) cannot hold an int array",enum_type,EnumToStringx(enum_type));} void SetValue(double scalar){_error_("PetscVec of enum %i (%s) cannot hold a scalar",enum_type,EnumToStringx(enum_type));} void SetValue(char* string){_error_("PetscVec of enum %i (%s) cannot hold a string",enum_type,EnumToStringx(enum_type));} @@ -71,4 +71,6 @@ void SetValue(double* doublearray,int M){_error_("PetscVec of enum %i (%s) cannot hold a double array",enum_type,EnumToStringx(enum_type));} void SetValue(double* pdoublearray,int M,int N){_error_("PetscVec of enum %i (%s) cannot hold a double array",enum_type,EnumToStringx(enum_type));} + void SetValue(int* intarray,int M){_error_("PetscVec of enum %i (%s) cannot hold a int array",enum_type,EnumToStringx(enum_type));} + void SetValue(int* pintarray,int M,int N){_error_("PetscVec of enum %i (%s) cannot hold a int array",enum_type,EnumToStringx(enum_type));} void SetValue(Vec vec); void SetValue(Mat mat){_error_("PetscVec of enum %i (%s) cannot hold a Mat",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk/src/c/objects/Params/StringArrayParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/StringArrayParam.h (revision 8599) +++ /issm/trunk/src/c/objects/Params/StringArrayParam.h (revision 8600) @@ -55,4 +55,5 @@ void GetParameterValue(int* pinteger){_error_("StringArray param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} void GetParameterValue(int** pintarray,int* pM){_error_("StringArray param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int** pintarray,int* pM,int* pN){_error_("StringArray param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} void GetParameterValue(double* pdouble){_error_("StringArray param of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} void GetParameterValue(char** pstring){_error_("StringArray param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} @@ -67,5 +68,4 @@ void SetValue(bool boolean){_error_("StringArray param of enum %i (%s) cannot hold a boolean",enum_type,EnumToStringx(enum_type));} void SetValue(int integer){_error_("StringArray param of enum %i (%s) cannot hold an integer",enum_type,EnumToStringx(enum_type));} - void SetValue(int* intarray,int M){_error_("StringArray param of enum %i (%s) cannot hold an int array",enum_type,EnumToStringx(enum_type));} void SetValue(double scalar){_error_("StringArray param of enum %i (%s) cannot hold a scalar",enum_type,EnumToStringx(enum_type));} void SetValue(char* string){_error_("StringArray param of enum %i (%s) cannot hold a string",enum_type,EnumToStringx(enum_type));} @@ -73,4 +73,6 @@ void SetValue(double* doublearray,int M){_error_("StringArray param of enum %i (%s) cannot hold a double array",enum_type,EnumToStringx(enum_type));} void SetValue(double* pdoublearray,int M,int N){_error_("StringArray param of enum %i (%s) cannot hold a double array",enum_type,EnumToStringx(enum_type));} + void SetValue(int* intarray,int M){_error_("StringArray param of enum %i (%s) cannot hold a int array",enum_type,EnumToStringx(enum_type));} + void SetValue(int* pintarray,int M,int N){_error_("StringArray param of enum %i (%s) cannot hold a int array",enum_type,EnumToStringx(enum_type));} void SetValue(Vec vec){_error_("StringArray param of enum %i (%s) cannot hold a Vec",enum_type,EnumToStringx(enum_type));} void SetValue(Mat mat){_error_("StringArray param of enum %i (%s) cannot hold a Mat",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk/src/c/objects/Params/StringParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/StringParam.h (revision 8599) +++ /issm/trunk/src/c/objects/Params/StringParam.h (revision 8600) @@ -53,4 +53,5 @@ void GetParameterValue(int* pinteger){_error_("String param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} void GetParameterValue(int** pintarray,int* pM){_error_("String param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int** pintarray,int* pM,int* pN){_error_("String param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} void GetParameterValue(double* pdouble){_error_("String param of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} void GetParameterValue(char** pstring); @@ -65,5 +66,4 @@ void SetValue(bool boolean){_error_("String param of enum %i (%s) cannot hold a boolean",enum_type,EnumToStringx(enum_type));} void SetValue(int integer){_error_("String param of enum %i (%s) cannot hold an integer",enum_type,EnumToStringx(enum_type));} - void SetValue(int* intarray,int M){_error_("String param of enum %i (%s) cannot hold an int array",enum_type,EnumToStringx(enum_type));} void SetValue(double scalar){_error_("String param of enum %i (%s) cannot hold a scalar",enum_type,EnumToStringx(enum_type));} void SetValue(char* string); @@ -71,4 +71,6 @@ void SetValue(double* doublearray,int M){_error_("String param of enum %i (%s) cannot hold a double array",enum_type,EnumToStringx(enum_type));} void SetValue(double* pdoublearray,int M,int N){_error_("String param of enum %i (%s) cannot hold a double array",enum_type,EnumToStringx(enum_type));} + void SetValue(int* intarray,int M){_error_("String param of enum %i (%s) cannot hold a int array",enum_type,EnumToStringx(enum_type));} + void SetValue(int* pintarray,int M,int N){_error_("String param of enum %i (%s) cannot hold a int array",enum_type,EnumToStringx(enum_type));} void SetValue(Vec vec){_error_("String param of enum %i (%s) cannot hold a Vec",enum_type,EnumToStringx(enum_type));} void SetValue(Mat mat){_error_("String param of enum %i (%s) cannot hold a Mat",enum_type,EnumToStringx(enum_type));}