Merge branch 'release-draft' into kk/patch/1.5.3

Argonne-National-Laboratory · Mar 2, 2023 · ed15ac8 · ed15ac8
2 parents 3a38e9e + 918333d
commit ed15ac8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/src/Solver/DualDecomp/DdDriverMpi.cpp b/src/Solver/DualDecomp/DdDriverMpi.cpp
@@ -121,7 +121,11 @@ DSP_RTN_CODE DdDriverMpi::run()
 		dualsol_.resize(ndualsol);
 		CoinCopyN(mw_->master_->getBestDualSolution(), ndualsol, &dualsol_[0]);
 
-		numNodes_ = mw_->master_->getDspOsiPtr()->getNumNodes();
+		if (mw_->master_->getDspOsiPtr()) {
+			numNodes_ = mw_->master_->getDspOsiPtr()->getNumNodes();
+		} else {
+			numNodes_ = 0;
+		}
 		numIterations_ = mw_->getIterationCount();
 
 		/** communicate */

diff --git a/src/Solver/DualDecomp/DdDriverSerial.cpp b/src/Solver/DualDecomp/DdDriverSerial.cpp
@@ -50,7 +50,6 @@ DSP_RTN_CODE DdDriverSerial::run()
 
 	/** run */
 	DSP_RTN_CHECK_THROW(mw_->run());
-
 	/** toc */
 	cputime_  = CoinCpuTime() - cputime_;
 	walltime_ = CoinGetTimeOfDay() - walltime_;
@@ -70,7 +69,11 @@ DSP_RTN_CODE DdDriverSerial::run()
 		CoinCopyN(master->getBestDualSolution(), model_->getNumCouplingRows(), &dualsol_[0]);
 		bestprimsol_ = primsol_;
 		bestdualsol_ = dualsol_;
-		numNodes_ = master->getDspOsiPtr()->getNumNodes();
+		if (master->getDspOsiPtr()) {
+			numNodes_ = master->getDspOsiPtr()->getNumNodes();
+		} else {
+			numNodes_ = 0;
+		}
 		numIterations_ = mw_->getIterationCount();
 	}
 	/** nullify master pointer */

diff --git a/src/Solver/DualDecomp/DdWorkerUB.cpp b/src/Solver/DualDecomp/DdWorkerUB.cpp
@@ -132,6 +132,10 @@ DSP_RTN_CODE DdWorkerUB::createProblem() {
 		for (int j = 0; j < mat_reco->getNumCols(); ++j)
 		{
 			obj_reco[j] *= tss->getProbability()[sind];
+		}
+
+		for (int j = 0; j < mat_reco->getNumCols(); ++j)
+		{
 			if (ctype_reco[j] != 'C')
 			{
 				has_integer = true;