fix r api

Author: jurgen-lentz

src/rampl.cpp

@@ -491,11 +491,11 @@ RParameterEntity RAMPL::getParameter(std::string name) const {
 */
 Rcpp::List RAMPL::getVariables() const {
   Rcpp::List list;
-  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;
 }
@@ -508,11 +508,11 @@ Rcpp::List RAMPL::getVariables() const {
 */
 Rcpp::List RAMPL::getConstraints() const {
   Rcpp::List list;
-  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;
 }
@@ -525,11 +525,11 @@ Rcpp::List RAMPL::getConstraints() const {
 */
 Rcpp::List RAMPL::getObjectives() const {
   Rcpp::List list;
-  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;
 }
@@ -542,11 +542,11 @@ Rcpp::List RAMPL::getObjectives() const {
 */
 Rcpp::List RAMPL::getSets() const {
   Rcpp::List list;
-  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;
 }
@@ -559,11 +559,11 @@ Rcpp::List RAMPL::getSets() const {
 */
 Rcpp::List RAMPL::getParameters() const {
   Rcpp::List list;
-  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,8 +228,9 @@ SEXP RBasicEntity<T, TW>::getScalar() const {
 */
 template <class T, class TW>
 SEXP RBasicEntity<T, TW>::find(Rcpp::List index) const {
+  typename ampl::BasicEntity<T>::iterator end = _impl.end();
   auto it = _impl.find(list2tuple(index));
-  if(it != _impl.end()) {
+  if(it != end) {
     return Rcpp::wrap(TW(it->second));
   } else {
     return R_NilValue;
@@ -245,7 +246,9 @@ SEXP RBasicEntity<T, TW>::find(Rcpp::List index) const {
 template <class T, class TW>
 Rcpp::List RBasicEntity<T, TW>::getInstances() const {
   Rcpp::List list;
-  for(auto it = _impl.begin(); it != _impl.end(); it++) {
+  typename ampl::BasicEntity<T>::iterator begin = _impl.begin();
+  typename ampl::BasicEntity<T>::iterator end = _impl.end();
+  for(auto it = begin; it != end; it++) {
     list[it->second.name()] = TW(it->second);
   }
   return list;