Skip to content

Commit

Permalink
fix msvc build, ansi C and cmake files
Browse files Browse the repository at this point in the history
  • Loading branch information
@adrpo
adrpo committed Oct 5, 2015
1 parent eda1836 commit 09dea26
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 20 deletions.
2 changes: 1 addition & 1 deletion SimulationRuntime/c/simulation/CMakeLists.txt
View file
Expand Up @@ -12,7 +12,7 @@ INCLUDE_DIRECTORIES("${OMCTRUNCHOME}/OMCompiler/3rdParty/FMIL/ThirdParty/Expat/e
# Quellen und Header
SET(simulation_sources
../linearization/linearize.cpp
modelinfo.c simulation_info_json.c simulation_input_xml.cpp socket.cpp
modelinfo.c simulation_info_json.c simulation_input_xml.c socket.cpp
options.c simulation_info_xml.c simulation_runtime.cpp)

SET(simulation_headers
Expand Down
40 changes: 21 additions & 19 deletions SimulationRuntime/c/simulation/simulation_input_xml.c
View file
Expand Up @@ -416,13 +416,18 @@ void read_input_xml(MODEL_DATA* modelData,
SIMULATION_INFO* simulationInfo)
{
omc_ModelInput mi = {0};
const char *filename;
const char *filename, *guid, *override, *overrideFile;
FILE* file = NULL;
XML_Parser parser = NULL;
hash_string_long *mapAlias = NULL, *mapAliasParam = NULL;
long *it, *itParam;
mmc_sint_t i;

modelica_integer nxchk, nychk, npchk;
modelica_integer nyintchk, npintchk;
modelica_integer nyboolchk, npboolchk;
modelica_integer nystrchk, npstrchk;

if(NULL == modelData->initXMLData)
{
/* read the filename from the command line (if any) */
Expand Down Expand Up @@ -488,7 +493,7 @@ void read_input_xml(MODEL_DATA* modelData,
/* first, check the modelGUID!
TODO! FIXME! THIS SEEMS TO FAIL!
ARE WE READING THE OLD XML FILE?? */
const char *guid = findHashStringStringNull(mi.md,"guid");
guid = findHashStringStringNull(mi.md,"guid");
if (NULL==guid) {
warningStreamPrint(LOG_STDOUT, 0, "The Model GUID: %s is not set in file: %s",
modelData->modelGUID,
Expand All @@ -503,8 +508,8 @@ void read_input_xml(MODEL_DATA* modelData,
}

// deal with override
const char* override = omc_flagValue[FLAG_OVERRIDE];
const char* overrideFile = omc_flagValue[FLAG_OVERRIDE_FILE];
override = omc_flagValue[FLAG_OVERRIDE];
overrideFile = omc_flagValue[FLAG_OVERRIDE_FILE];
doOverride(&mi, modelData, override, overrideFile);

/* read all the DefaultExperiment values */
Expand Down Expand Up @@ -535,11 +540,6 @@ void read_input_xml(MODEL_DATA* modelData,
infoStreamPrint(LOG_SIMULATION, 0, "OPENMODELICAHOME: %s", simulationInfo->OPENMODELICAHOME);
messageClose(LOG_SIMULATION);

modelica_integer nxchk, nychk, npchk;
modelica_integer nyintchk, npintchk;
modelica_integer nyboolchk, npboolchk;
modelica_integer nystrchk, npstrchk;

read_value_long(findHashStringString(mi.md,"numberOfContinuousStates"), &nxchk, 0);
read_value_long(findHashStringString(mi.md,"numberOfRealAlgebraicVariables"), &nychk, 0);
read_value_long(findHashStringString(mi.md,"numberOfRealParameters"), &npchk, 0);
Expand Down Expand Up @@ -623,9 +623,9 @@ void read_input_xml(MODEL_DATA* modelData,
infoStreamPrint(LOG_DEBUG, 1, "read xml file for real alias vars");
for(i=0; i<modelData->nAliasReal; i++)
{
const char *aliasTmp;
read_var_info(*findHashLongVar(mi.rAli,i), &modelData->realAlias[i].info);

const char *aliasTmp;
read_value_string(findHashStringStringNull(*findHashLongVar(mi.rAli,i),"alias"), &aliasTmp);
if (0 == strcmp(aliasTmp,"negatedAlias")) {
modelData->realAlias[i].negate = 1;
Expand Down Expand Up @@ -668,9 +668,9 @@ void read_input_xml(MODEL_DATA* modelData,
infoStreamPrint(LOG_DEBUG, 1, "read xml file for integer alias vars");
for(i=0; i<modelData->nAliasInteger; i++)
{
const char *aliasTmp;
read_var_info(*findHashLongVar(mi.iAli,i), &modelData->integerAlias[i].info);

const char *aliasTmp;
read_value_string(findHashStringStringNull(*findHashLongVar(mi.iAli,i),"alias"), &aliasTmp);
if (0 == strcmp(aliasTmp,"negatedAlias")) {
modelData->integerAlias[i].negate = 1;
Expand Down Expand Up @@ -711,9 +711,9 @@ void read_input_xml(MODEL_DATA* modelData,
infoStreamPrint(LOG_DEBUG, 1, "read xml file for boolean alias vars");
for(i=0; i<modelData->nAliasBoolean; i++)
{
const char *aliasTmp;
read_var_info(*findHashLongVar(mi.bAli,i), &modelData->booleanAlias[i].info);

const char *aliasTmp;
read_value_string(findHashStringString(*findHashLongVar(mi.bAli,i),"alias"), &aliasTmp);
if (0 == strcmp(aliasTmp,"negatedAlias")) {
modelData->booleanAlias[i].negate = 1;
Expand Down Expand Up @@ -754,9 +754,9 @@ void read_input_xml(MODEL_DATA* modelData,
infoStreamPrint(LOG_DEBUG, 1, "read xml file for string alias vars");
for(i=0; i<modelData->nAliasString; i++)
{
const char *aliasTmp;
read_var_info(*findHashLongVar(mi.sAli,i), &modelData->stringAlias[i].info);

const char *aliasTmp;
read_value_string(findHashStringString(*findHashLongVar(mi.sAli,i),"alias"), &aliasTmp);
if (0 == strcmp(aliasTmp,"negatedAlias")) {
modelData->stringAlias[i].negate = 1;
Expand Down Expand Up @@ -893,13 +893,15 @@ void doOverride(omc_ModelInput *mi, MODEL_DATA *modelData, const char *override,
}

if(overrideFile != NULL) {
/* read override values from file */
infoStreamPrint(LOG_SOLVER, 0, "read override values from file: %s", overrideFile);
FILE *infile = fopen(overrideFile, "r");
FILE *infile = NULL;
char *line=NULL, *tline=NULL, *tline2=NULL;
char *overrideLine;
size_t n=0;

/* read override values from file */
infoStreamPrint(LOG_SOLVER, 0, "read override values from file: %s", overrideFile);

infile = fopen(overrideFile, "r");
if (0==infile) {
throwStreamPrint(NULL, "simulation_input_xml.cpp: could not open the file given to -overrideFile=%s", overrideFile);
}
Expand Down Expand Up @@ -941,12 +943,13 @@ void doOverride(omc_ModelInput *mi, MODEL_DATA *modelData, const char *override,
}

if (overrideStr != NULL) {
char *value;
char *value, *p;
const char *strs[] = {"solver","startTime","stopTime","stepSize","tolerance","outputFormat","variableFilter"};
/* read override values */
infoStreamPrint(LOG_SOLVER, 0, "read override values: %s", overrideStr);
/* fix overrideStr to contain | instead of , for splitting */
parseVariableStr(overrideStr);
char *p = strtok(overrideStr, "!");
p = strtok(overrideStr, "!");

while (p) {
// split it key = value => map[key]=value
Expand All @@ -970,7 +973,6 @@ void doOverride(omc_ModelInput *mi, MODEL_DATA *modelData, const char *override,
free(overrideStr);

// now we have all overrides in mOverrides, override mi now
const char *strs[] = {"solver","startTime","stopTime","stepSize","tolerance","outputFormat","variableFilter"};
for (i=0; i<sizeof(strs)/sizeof(char*); i++) {
if (findHashStringStringNull(mOverrides, strs[i])) {
addHashStringString(&mi->de, strs[i], getOverrideValue(mOverrides, &mOverridesUses, strs[i]));
Expand Down

0 comments on commit 09dea26

Please sign in to comment.