#1097: remove solve alias for evaluate

casadi · May 12, 2014 · 896fe11 · ghorn · May 12, 2014 · jaeandersson
1 parent 61d8d6d
commit 896fe11
Show file tree

Hide file tree

Showing 21 changed files with 17 additions and 34 deletions.
diff --git a/casadi/core/function/function.cpp b/casadi/core/function/function.cpp
@@ -126,10 +126,6 @@ namespace casadi {
     (*this)->evaluate();
   }
 
-  void Function::solve() {
-    evaluate();
-  }
-
   int Function::getNumInputNonzeros() const {
     return (*this)->getNumInputNonzeros();
   }

diff --git a/casadi/core/function/function.hpp b/casadi/core/function/function.hpp
@@ -156,9 +156,6 @@ namespace casadi {
     /** \brief  Evaluate */
     void evaluate();
 
-    /// the same as evaluate()
-    void solve();
-
     ///@{
     /** \brief Generate a Jacobian function of output \a oind with respect to input \a iind
      * \param iind The index of the input

diff --git a/casadi/core/function/lp_internal.cpp b/casadi/core/function/lp_internal.cpp
@@ -72,10 +72,6 @@ void LPSolverInternal::evaluate() {
   throw CasadiException("LPSolverInternal::evaluate: Not implemented");
 }
 
-void LPSolverInternal::solve() {
-  throw CasadiException("LPSolverInternal::solve: Not implemented");
-}
-
 void LPSolverInternal::checkInputs() const {
   for (int i=0;i<input(LP_SOLVER_LBX).size();++i) {
     casadi_assert_message(input(LP_SOLVER_LBX).at(i)<=input(LP_SOLVER_UBX).at(i),

diff --git a/casadi/core/function/lp_internal.hpp b/casadi/core/function/lp_internal.hpp
@@ -46,9 +46,6 @@ class CASADI_CORE_EXPORT LPSolverInternal : public FunctionInternal {
     // Solve the system of equations
     virtual void evaluate();
 
-    // Solve the system of equations
-    virtual void solve();
-
     /// \brief Check if the numerical values of the supplied bounds make sense
     virtual void checkInputs() const;
 

diff --git a/casadi/optimal_control/direct_collocation_internal.cpp b/casadi/optimal_control/direct_collocation_internal.cpp
@@ -380,7 +380,7 @@ void DirectCollocationInternal::evaluate() {
                       nlp_solver_.input(NLP_SOLVER_UBG).data());
 
   //Solve the problem
-  nlp_solver_.solve();
+  nlp_solver_.evaluate();
 
   // Save the optimal solution
   setOptimalSolution(nlp_solver_.output(NLP_SOLVER_X).data());

diff --git a/casadi/optimal_control/direct_multiple_shooting_internal.cpp b/casadi/optimal_control/direct_multiple_shooting_internal.cpp
@@ -338,7 +338,7 @@ void DirectMultipleShootingInternal::evaluate() {
                       nlp_solver_.input(NLP_SOLVER_UBG).data());
 
   //Solve the problem
-  nlp_solver_.solve();
+  nlp_solver_.evaluate();
 
   // Save the optimal solution
   setOptimalSolution(nlp_solver_.output(NLP_SOLVER_X).data());

diff --git a/casadi/optimal_control/direct_single_shooting_internal.cpp b/casadi/optimal_control/direct_single_shooting_internal.cpp
@@ -305,7 +305,7 @@ void DirectSingleShootingInternal::evaluate() {
                       nlp_solver_.input(NLP_SOLVER_UBG).data());
 
   //Solve the problem
-  nlp_solver_.solve();
+  nlp_solver_.evaluate();
 
   // Save the optimal solution
   setOptimalSolution(nlp_solver_.output(NLP_SOLVER_X).data());

diff --git a/docs/examples/cplusplus/cstr.cpp b/docs/examples/cplusplus/cstr.cpp
@@ -135,7 +135,7 @@ int main(){
   }
 
   // Solve the problem
-  ocp_solver.solve();
+  ocp_solver.evaluate();
 
 
 

diff --git a/docs/examples/cplusplus/ipopt_nl.cpp b/docs/examples/cplusplus/ipopt_nl.cpp
@@ -67,7 +67,7 @@ int main(int argc, char **argv){
   nlp_solver.setInput(nl.x_init,"x0");
 
   // Solve NLP
-  nlp_solver.solve();
+  nlp_solver.evaluate();
 
   return 0;
 }
diff --git a/docs/examples/cplusplus/knitro_nl.cpp b/docs/examples/cplusplus/knitro_nl.cpp
@@ -63,6 +63,6 @@ int main(int argc, char **argv){
   nlp_solver.setInput(nl.x_init,"x0");
 
   // Solve NLP
-  nlp_solver.solve();
+  nlp_solver.evaluate();
   return 0;
 }
diff --git a/docs/examples/cplusplus/multiple_shooting_from_scratch.cpp b/docs/examples/cplusplus/multiple_shooting_from_scratch.cpp
@@ -182,7 +182,7 @@ int main(){
   nlp_solver.setInput(0.,"ubg");
 
   // Solve the problem
-  nlp_solver.solve();
+  nlp_solver.evaluate();
 
   // Optimal solution of the NLP
   const Matrix<double>& V_opt = nlp_solver.output("x");

diff --git a/docs/examples/cplusplus/rocket_ipopt.cpp b/docs/examples/cplusplus/rocket_ipopt.cpp
@@ -107,7 +107,7 @@ int main(){
   solver.setInput(gmax,"ubg");
 
   // Solve the problem
-  solver.solve();
+  solver.evaluate();
 
   // Print the optimal cost
   double cost;

diff --git a/docs/examples/cplusplus/rocket_mx_and_sx.cpp b/docs/examples/cplusplus/rocket_mx_and_sx.cpp
@@ -140,7 +140,7 @@ int main(){
   solver.setInput(Gmax,"ubg");
 
   // Solve the problem
-  solver.solve();
+  solver.evaluate();
 
   // Get the solution
   solver.getOutput(Usol,"x");

diff --git a/docs/examples/cplusplus/rocket_single_shooting.cpp b/docs/examples/cplusplus/rocket_single_shooting.cpp
@@ -198,7 +198,7 @@ int main(){
   solver.setInput(Gmax,"ubg");
 
   // Solve the problem
-  solver.solve();
+  solver.evaluate();
 
   // Get the solution
   solver.getOutput(Usol,"x");

diff --git a/docs/examples/cplusplus/rocket_snopt.cpp b/docs/examples/cplusplus/rocket_snopt.cpp
@@ -107,7 +107,7 @@ int main(){
   solver.setInput(gmax,"ubg");
 
   // Solve the problem
-  solver.solve();
+  solver.evaluate();
 
   // Print the optimal cost
   double cost;

diff --git a/docs/examples/cplusplus/snopt_nl.cpp b/docs/examples/cplusplus/snopt_nl.cpp
@@ -63,7 +63,7 @@ int main(int argc, char **argv){
   nlp_solver.setInput(nl.x_init,"x0");
 
   // Solve NLP
-  nlp_solver.solve();
+  nlp_solver.evaluate();
 
   return 0;
 }
diff --git a/docs/examples/cplusplus/sqpmethod_nl.cpp b/docs/examples/cplusplus/sqpmethod_nl.cpp
@@ -80,6 +80,6 @@ int main(int argc, char **argv){
   nlp_solver.setInput(nl.x_init,"x0");
 
   // Solve NLP
-  nlp_solver.solve();
+  nlp_solver.evaluate();
   return 0;
 }
diff --git a/docs/examples/cplusplus/stabilized_sqpmethod_nl.cpp b/docs/examples/cplusplus/stabilized_sqpmethod_nl.cpp
@@ -105,6 +105,6 @@ int main(int argc, char **argv){
   nlp_solver.setInput(nl.x_init,"x0");
 
   // Solve NLP
-  nlp_solver.solve();
+  nlp_solver.evaluate();
   return 0;
 }
diff --git a/docs/examples/cplusplus/test_liftopt.cpp b/docs/examples/cplusplus/test_liftopt.cpp
@@ -104,7 +104,7 @@ int main(){
   solver.input("ubx").setAll(1);
 
   // Solve the problem
-  solver.solve();
+  solver.evaluate();
 
   return 0;
 }
diff --git a/docs/examples/cplusplus/vdp_multiple_shooting.cpp b/docs/examples/cplusplus/vdp_multiple_shooting.cpp
@@ -146,13 +146,10 @@ int main(){
   ms.input("lbx")(1,ns) = ms.input("ubx")(1,ns) = 0; 
 
   // Solve the problem
-  ms.solve();
+  ms.evaluate();
 
   cout << ms.output("x_opt") << endl;
   cout << ms.output("u_opt") << endl;
 
   return 0;
 }
-
-
-
diff --git a/docs/examples/cplusplus/worhp_nl.cpp b/docs/examples/cplusplus/worhp_nl.cpp
@@ -64,6 +64,6 @@ int main(int argc, char **argv){
   nlp_solver.setInput(nl.x_init,"x0");
 
   // Solve NLP
-  nlp_solver.solve();
+  nlp_solver.evaluate();
   return 0;
 }