fix to new api

Author: jurgen-lentz

docs/source/reference/ramplcpp.rst

@@ -203,10 +203,12 @@ AMPL
 
   Returns ``TRUE``  if the underlying engine is running.
 
-.. method:: AMPL.solve("", "")
+.. method:: AMPL.solve(problem, solver)
 
   Solve the current model.
 
+  :param string problem: The problem that will be solved.
+  :param string solver: The solver that will be used to solve the problem.
   :raises Error: If the underlying interpreter is not running.
 
 .. method:: AMPL.getData(statements)

src/rampl.cpp

@@ -471,12 +471,11 @@ RParameterEntity RAMPL::getParameter(std::string name) const {
 */
 Rcpp::List RAMPL::getVariables() const {
   Rcpp::List list;
-  //const ampl::EntityMap<ampl::Variable> map = _impl.getVariables();
-  ampl::EntityMap<ampl::Variable> map = _impl.getVariables();
+  const ampl::EntityMap<ampl::Variable> map = _impl.getVariables();
   ampl::EntityMap<ampl::Variable>::iterator begin = map.begin();
   ampl::EntityMap<ampl::Variable>::iterator end = map.end();
   for(ampl::EntityMap<ampl::Variable>::iterator itr = begin; itr != end; itr++){
-    list[itr->first] = RVariableEntity(itr->second);
+    list[itr->name()] = RVariableEntity(*itr);
   }
   return list;
 }
@@ -489,12 +488,11 @@ Rcpp::List RAMPL::getVariables() const {
 */
 Rcpp::List RAMPL::getConstraints() const {
   Rcpp::List list;
-  //const ampl::EntityMap<ampl::Constraint> map = _impl.getConstraints();
-  ampl::EntityMap<ampl::Constraint> map = _impl.getConstraints();
+  const ampl::EntityMap<ampl::Constraint> map = _impl.getConstraints();
   ampl::EntityMap<ampl::Constraint>::iterator begin = map.begin();
   ampl::EntityMap<ampl::Constraint>::iterator end = map.end();
   for(ampl::EntityMap<ampl::Constraint>::iterator itr = begin; itr != end; itr++){
-    list[itr->first] = RConstraintEntity(itr->second);
+    list[itr->name()] = RConstraintEntity(*itr);
   }
   return list;
 }
@@ -507,12 +505,11 @@ Rcpp::List RAMPL::getConstraints() const {
 */
 Rcpp::List RAMPL::getObjectives() const {
   Rcpp::List list;
-  //const ampl::EntityMap<ampl::Objective> map = _impl.getObjectives();
-  ampl::EntityMap<ampl::Objective> map = _impl.getObjectives();
+  const ampl::EntityMap<ampl::Objective> map = _impl.getObjectives();
   ampl::EntityMap<ampl::Objective>::iterator begin = map.begin();
   ampl::EntityMap<ampl::Objective>::iterator end = map.end();
   for(ampl::EntityMap<ampl::Objective>::iterator itr = begin; itr != end; itr++){
-    list[itr->first] = RObjectiveEntity(itr->second);
+    list[itr->name()] = RObjectiveEntity(*itr);
   }
   return list;
 }
@@ -525,12 +522,11 @@ Rcpp::List RAMPL::getObjectives() const {
 */
 Rcpp::List RAMPL::getSets() const {
   Rcpp::List list;
-  //const ampl::EntityMap<ampl::Set> map = _impl.getSets();
-  ampl::EntityMap<ampl::Set> map = _impl.getSets();
+  const ampl::EntityMap<ampl::Set> map = _impl.getSets();
   ampl::EntityMap<ampl::Set>::iterator begin = map.begin();
   ampl::EntityMap<ampl::Set>::iterator end = map.end();
   for(ampl::EntityMap<ampl::Set>::iterator itr = begin; itr != end; itr++){
-    list[itr->first] = RSetEntity(itr->second);
+    list[itr->name()] = RSetEntity(*itr);
   }
   return list;
 }
@@ -543,12 +539,11 @@ Rcpp::List RAMPL::getSets() const {
 */
 Rcpp::List RAMPL::getParameters() const {
   Rcpp::List list;
-  //const ampl::EntityMap<ampl::Parameter> map = _impl.getParameters();
-  ampl::EntityMap<ampl::Parameter> map = _impl.getParameters();
+  const ampl::EntityMap<ampl::Parameter> map = _impl.getParameters();
   ampl::EntityMap<ampl::Parameter>::iterator begin = map.begin();
   ampl::EntityMap<ampl::Parameter>::iterator end = map.end();
   for(ampl::EntityMap<ampl::Parameter>::iterator itr = begin; itr != end; itr++){
-    list[itr->first] = RParameterEntity(itr->second);
+    list[itr->name()] = RParameterEntity(*itr);
   }
   return list;
 }

src/rbasicentity.h

@@ -228,9 +228,8 @@ SEXP RBasicEntity<T, TW>::getScalar() const {
 */
 template <class T, class TW>
 SEXP RBasicEntity<T, TW>::find(Rcpp::List index) const {
-  std::map<ampl::Tuple, T> instances = _impl.getInstances();
-  typename std::map<ampl::Tuple, T>::iterator it = instances.find(list2tuple(index));
-  if(it != instances.end()) {
+  typename ampl::BasicEntity<T>::iterator it = _impl.find(list2tuple(index));
+  if(it != _impl.end()) {
     return Rcpp::wrap(TW(it->second));
   } else {
     return R_NilValue;
@@ -246,8 +245,7 @@ SEXP RBasicEntity<T, TW>::find(Rcpp::List index) const {
 template <class T, class TW>
 Rcpp::List RBasicEntity<T, TW>::getInstances() const {
   Rcpp::List list;
-  std::map<ampl::Tuple, T> instances = _impl.getInstances();
-  for(typename std::map<ampl::Tuple, T>::iterator it = instances.begin(); it != instances.end(); it++) {
+  for(typename ampl::BasicEntity<T>::iterator it = _impl.begin(); it != _impl.end(); it++) {
     list[it->second.name()] = TW(it->second);
   }
   return list;

src/rparam_entity.cpp

@@ -165,9 +165,8 @@ SEXP RParameterEntity::getScalar() const {
 }
 
 SEXP RParameterEntity::find(Rcpp::List index) const {
-  std::map<ampl::Tuple, ampl::Variant> instances = _impl.getInstances();
-  typename std::map<ampl::Tuple, ampl::Variant>::iterator it = instances.find(list2tuple(index));
-  if(it != instances.end()) {
+  ampl::BasicEntity<ampl::Variant>::iterator it = _impl.find(list2tuple(index));
+  if(it != _impl.end()) {
     return variant2sexp(it->second);
   } else {
     return R_NilValue;
@@ -176,8 +175,7 @@ SEXP RParameterEntity::find(Rcpp::List index) const {
 
 Rcpp::List RParameterEntity::getInstances() const {
   Rcpp::List list;
-  std::map<ampl::Tuple, ampl::Variant> instances = _impl.getInstances();
-  for(typename std::map<ampl::Tuple, ampl::Variant>::iterator it = instances.begin(); it != instances.end(); it++) {
+  for(ampl::BasicEntity<ampl::Variant>::iterator it = _impl.begin(); it != _impl.end(); it++) {
     Rcpp::List row = tuple2list(it->first);
     row.push_back(variant2sexp(it->second));
     list.push_back(row);