--- trunk/gadget/maininfo.cc 2015/07/23 19:00:38 11 +++ trunk/gadget/maininfo.cc 2015/07/24 18:36:24 12 @@ -41,7 +41,7 @@ } MainInfo::MainInfo() - : givenOptInfo(0), givenInitialParam(0), runoptimise(0), runomp(0), + : givenOptInfo(0), givenInitialParam(0), runoptimise(0), runstochastic(0), runnetwork(0), runprint(1), forceprint(0), printInitialInfo(0), printFinalInfo(0), printLogLevel(0), maxratio(0.95) { @@ -109,10 +109,6 @@ } else if (strcasecmp(aVector[k], "-s") == 0) { runstochastic = 1; -//FIXME - }else if (strcasecmp(aVector[k], "-omp") == 0) { - runomp = 1; - } else if (strcasecmp(aVector[k], "-m") == 0) { ifstream infile; CommentStream incomment(infile); @@ -233,7 +229,7 @@ k++; seed[0] = atoi(aVector[k]); srand(seed[0]); -//FIXME + //seedM = seed to set the metropolis acceptance in SA } else if (strcasecmp(aVector[k], "-seedM") == 0) { //JMB experimental setting of random number seed from the commandline //if the "seed" is also specified in the optinfo file then that will override @@ -242,7 +238,7 @@ this->showCorrectUsage(aVector[k]); k++; seed[1] = atoi(aVector[k]); - + //seedP = seed to set the orden of evaluation of the parameter in SA } else if (strcasecmp(aVector[k], "-seedP") == 0) { //JMB experimental setting of random number seed from the commandline //if the "seed" is also specified in the optinfo file then that will override