summaryrefslogtreecommitdiff
path: root/sci_gateway
diff options
context:
space:
mode:
Diffstat (limited to 'sci_gateway')
-rw-r--r--sci_gateway/cpp/.Rhistory0
-rwxr-xr-xsci_gateway/cpp/libFOSSEE_Optimization_Toolbox.sobin194948 -> 194948 bytes
-rw-r--r--sci_gateway/cpp/sci_ipoptfmincon.cpp3
-rw-r--r--sci_gateway/cpp/sci_minconNLP.cpp12
4 files changed, 11 insertions, 4 deletions
diff --git a/sci_gateway/cpp/.Rhistory b/sci_gateway/cpp/.Rhistory
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/sci_gateway/cpp/.Rhistory
diff --git a/sci_gateway/cpp/libFOSSEE_Optimization_Toolbox.so b/sci_gateway/cpp/libFOSSEE_Optimization_Toolbox.so
index 9a4caf4..28c2d3b 100755
--- a/sci_gateway/cpp/libFOSSEE_Optimization_Toolbox.so
+++ b/sci_gateway/cpp/libFOSSEE_Optimization_Toolbox.so
Binary files differ
diff --git a/sci_gateway/cpp/sci_ipoptfmincon.cpp b/sci_gateway/cpp/sci_ipoptfmincon.cpp
index 18218a5..f19bbeb 100644
--- a/sci_gateway/cpp/sci_ipoptfmincon.cpp
+++ b/sci_gateway/cpp/sci_ipoptfmincon.cpp
@@ -140,9 +140,10 @@ int sci_solveminconp(char *fname)
////////// Managing the parameters //////////
- app->Options()->SetNumericValue("tol", 1e-7);
+ app->Options()->SetNumericValue("tol", 1e-6);
app->Options()->SetIntegerValue("max_iter", (int)*max_iter);
app->Options()->SetNumericValue("max_cpu_time", *cpu_time);
+// app->Options()->SetStringValue("hessian_approximation", "limited-memory");
///////// Initialize the IpoptApplication and process the options /////////
ApplicationReturnStatus status;
diff --git a/sci_gateway/cpp/sci_minconNLP.cpp b/sci_gateway/cpp/sci_minconNLP.cpp
index 600aed6..845e983 100644
--- a/sci_gateway/cpp/sci_minconNLP.cpp
+++ b/sci_gateway/cpp/sci_minconNLP.cpp
@@ -500,9 +500,17 @@ bool minconNLP::eval_h(Index n, const Number* x, bool new_x,Number obj_factor, I
finalHessian_[n*row+col]=values[index++];
}
}
+
+ index=0;
+ for (Index col=0;col < numVars_ ;++col)
+ {
+ for (Index row=0; row <= col; ++row)
+ {
+ finalHessian_[n*row+col]=values[index++];
+ }
+ }
}
-
return true;
}
@@ -586,5 +594,3 @@ int minconNLP::returnStatus()
}
-
-