Merge branch 'master' into mumps

sheerluck · Oct 17, 2022 · fc9753e · fc9753e
2 parents 9285826 + 67ae315
commit fc9753e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,7 +33,7 @@ cmake_minimum_required(VERSION 2.6)
 
 PROJECT(qpOASES CXX)
 SET(PACKAGE_NAME "qpOASES")
-SET(PACKAGE_VERSION "3.2.0")
+SET(PACKAGE_VERSION "3.2.2")
 SET(PACKAGE_SO_VERSION "3.2")
 SET(PACKAGE_DESCRIPTION "An implementation of the online active set strategy")
 SET(PACKAGE_AUTHOR "Hans Joachim Ferreau, Andreas Potschka, Christian Kirches et al.")

diff --git a/Makefile b/Makefile
@@ -42,8 +42,7 @@ else
 EXTERNAL =
 endif
 
-all:  $(EXTERNAL) src examples
-
+all:  $(EXTERNAL) bin src examples
 #src_aw testing
 
 ifeq ($(DEF_SOLVER), SOLVER_MUMPS)
@@ -59,6 +58,9 @@ endif
 src: $(EXTERNAL)
 	@cd $@; ${MAKE} -s
 
+bin:
+	mkdir bin
+
 #src_aw:
 #	@cd $@; ${MAKE} -s
 

diff --git a/src/Matrices.cpp b/src/Matrices.cpp
@@ -850,10 +850,8 @@ returnValue SparseMatrix::getRowNorm( real_t* norm, int_t type ) const
 			break;
 		case 1:
 			for ( j=0; j < nCols; ++j ) {
-				// FIXME please add guarding or fix indent for "for loop" to
-				//       remove compile warnings
 				for (i = jc[j]; i < jc[j+1]; i++);
-				  norm[ir[i]] += getAbs( val[i] );
+				norm[ir[i]] += getAbs( val[i] );
 			}
 			break;
 		default:

diff --git a/src/SparseSolver.cpp b/src/SparseSolver.cpp
@@ -793,7 +793,8 @@ returnValue Ma57SparseSolver::factorize( )
 	 * Call MA57AD for symbolic factorization *
 	******************************************/
 
-	fint_t lkeep_ma57 = 5*dim + numNonzeros + getMax(numNonzeros,dim) + 42;
+	fint_t max_nnz = numNonzeros > dim ? numNonzeros : dim;
+	fint_t lkeep_ma57 = 5*dim + numNonzeros + max_nnz + 42;
 	fint_t *keep_ma57 = new fint_t[lkeep_ma57];
 	fint_t *iwork_ma57 = new fint_t[5*dim];
 
@@ -825,7 +826,7 @@ returnValue Ma57SparseSolver::factorize( )
 	fact_ma57 = new double[lfact_ma57];
 
 	lifact_ma57 = (fint_t)(lfact_factor * (double)(info_ma57[9]));
-	ifact_ma57 = new int_t[lifact_ma57];
+	ifact_ma57 = new fint_t[lifact_ma57];
 
     /*******************************************
 	 * Call MA57BD for numerical factorization *