revised trap for opt base jco restart with only dec vars (risk = 0.5)

jwhite-usgs · jwhite-usgs · commit 7da64ec524ac · 2020-07-06T10:19:56.000-05:00
diff --git a/src/libs/opt/sequential_lp.cpp b/src/libs/opt/sequential_lp.cpp
@@ -972,7 +972,7 @@ void sequentialLP::iter_presolve()
 				missing.push_back(name);
 		if (missing.size() > 0)
 			throw_sequentialLP_error("the following decision vars were not found in the jacobian " + basejac_filename + " : ", missing);
-		if (constraints.get_use_fosm())
+		if ((constraints.get_use_chance()) && (constraints.get_use_fosm()))
 		{
 			for (auto& name : constraints.get_adj_par_names())
 				//if (find(start, end, name) == end)

Original file line number	Diff line number	Diff line change
`@@ -972,7 +972,7 @@ void sequentialLP::iter_presolve()`
`972`	`972`	`missing.push_back(name);`
`973`	`973`	`if (missing.size() > 0)`
`974`	`974`	`throw_sequentialLP_error("the following decision vars were not found in the jacobian " + basejac_filename + " : ", missing);`
`975`		`- if (constraints.get_use_fosm())`
	`975`	`+ if ((constraints.get_use_chance()) && (constraints.get_use_fosm()))`
`976`	`976`	`{`
`977`	`977`	`for (auto& name : constraints.get_adj_par_names())`
`978`	`978`	`//if (find(start, end, name) == end)`