Diff of /trunk/gadget/maininfo.cc

Parent Directory | Revision Log | Patch

	revision 11, Thu Jul 23 19:00:38 2015 UTC	revision 12, Fri Jul 24 18:36:24 2015 UTC
#	Line 41	Line 41
41	}	}
42
43	MainInfo::MainInfo()	MainInfo::MainInfo()
44	: givenOptInfo(0), givenInitialParam(0), runoptimise(0), runomp(0),	: givenOptInfo(0), givenInitialParam(0), runoptimise(0),
45	runstochastic(0), runnetwork(0), runprint(1), forceprint(0),	runstochastic(0), runnetwork(0), runprint(1), forceprint(0),
46	printInitialInfo(0), printFinalInfo(0), printLogLevel(0), maxratio(0.95) {	printInitialInfo(0), printFinalInfo(0), printLogLevel(0), maxratio(0.95) {
47
#	Line 109	Line 109
109
110	} else if (strcasecmp(aVector[k], "-s") == 0) {	} else if (strcasecmp(aVector[k], "-s") == 0) {
111	runstochastic = 1;	runstochastic = 1;
	//FIXME
	}else if (strcasecmp(aVector[k], "-omp") == 0) {
	runomp = 1;
112	} else if (strcasecmp(aVector[k], "-m") == 0) {	} else if (strcasecmp(aVector[k], "-m") == 0) {
113	ifstream infile;	ifstream infile;
114	CommentStream incomment(infile);	CommentStream incomment(infile);
#	Line 233	Line 229
229	k++;	k++;
230	seed[0] = atoi(aVector[k]);	seed[0] = atoi(aVector[k]);
231	srand(seed[0]);	srand(seed[0]);
232	//FIXME	//seedM = seed to set the metropolis acceptance in SA
233	} else if (strcasecmp(aVector[k], "-seedM") == 0) {	} else if (strcasecmp(aVector[k], "-seedM") == 0) {
234	//JMB experimental setting of random number seed from the commandline	//JMB experimental setting of random number seed from the commandline
235	//if the "seed" is also specified in the optinfo file then that will override	//if the "seed" is also specified in the optinfo file then that will override
#	Line 242	Line 238
238	this->showCorrectUsage(aVector[k]);	this->showCorrectUsage(aVector[k]);
239	k++;	k++;
240	seed[1] = atoi(aVector[k]);	seed[1] = atoi(aVector[k]);
241		//seedP = seed to set the orden of evaluation of the parameter in SA
242	} else if (strcasecmp(aVector[k], "-seedP") == 0) {	} else if (strcasecmp(aVector[k], "-seedP") == 0) {
243	//JMB experimental setting of random number seed from the commandline	//JMB experimental setting of random number seed from the commandline
244	//if the "seed" is also specified in the optinfo file then that will override	//if the "seed" is also specified in the optinfo file then that will override

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.11   changed lines   Added in v.12

---

root@forge.cesga.es	ViewVC Help
Powered by ViewVC 1.0.0