Changeset 23 for cpp/f8-to-f1

Timestamp:

06/27/09 11:12:12 (16 years ago)

Author:

mwajcht

Message:

Bug-fix in erasing elements from vectors in 'for' loops - use integer loop counters instead of iterators (after last element of a vector is erased incremented iterator does not point to vector.end())

Location:

cpp/f8-to-f1

Files:

• conv_f8tof1.cpp (modified) (1 diff)
• geno_f8.cpp (modified) (2 diffs)

cpp/f8-to-f1/conv_f8tof1.cpp

@@ -702 +702 @@
                          subProdIter != prodIter->second->subproductions.end(); subProdIter++) {
                         SubProduction subProduction = *subProdIter;
-                        for (vector<ActionStrP>::iterator actionIter = subProduction.actions.begin();
-                                 actionIter != subProduction.actions.end(); actionIter++) {
-                                if ((*actionIter).action == NULL) {
-                                        subProduction.actions.erase(actionIter);
+                        for (int i = 0; i < subProduction.actions.size(); i++) {
+                                if (subProduction.actions.at(i).action == NULL) {
+                                        subProduction.actions.erase(subProduction.actions.begin() + i);
                                 }
                         }

cpp/f8-to-f1/geno_f8.cpp

@@ -1136 +1136 @@
                         
                         //actions
-                        for (vector<ActionStrP>::iterator actionIter = (*subprodIter).actions.begin();
-                                 actionIter != (*subprodIter).actions.end(); actionIter++) {
-                                if ((*actionIter).action == NULL) {
+                        for (int i = 0; i < (*subprodIter).actions.size(); i++) {
+                                if ((*subprodIter).actions.at(i).action == NULL) {
                                         continue;
                                 }
-                                SString &actionName = (*actionIter).action->name;
+                                SString &actionName = (*subprodIter).actions.at(i).action->name;
                                 if (actionName[0] == 'n') {
                                         if (paramNames.size() > 0) {
@@ -1148 +1147 @@
                                                 if (searchIter != paramNames.end()) { //valid name
                                                         //ensure it is linked to the correct production
-                                                        (*actionIter).action = newLsystem->getParamProduction(actionName);
+                                                        (*subprodIter).actions.at(i).action = newLsystem->getParamProduction(actionName);
                                                 } else {
                                                         //link to random parameter prodution
                                                         SString name = paramNames[randomN(paramNames.size())];
-                                                        (*actionIter).action = newLsystem->getParamProduction(name);
+                                                        (*subprodIter).actions.at(i).action = newLsystem->getParamProduction(name);
                                                 }
                                         } else { //no params, so delete this param production
-                                                (*subprodIter).actions.erase(actionIter);  //TODO sprawdzić zachowanie iteratora!!!
+                                                (*subprodIter).actions.erase((*subprodIter).actions.begin() + i);
                                         }
                                 } else if (actionName[0] == 'P') {
                                         if (newLsystem->productions.find(sstringToString(actionName)) != newLsystem->productions.end()) {
                                                 //ensure it is linked to the correct production
-                                                (*actionIter).action = newLsystem->productions[sstringToString(actionName)];
+                                                (*subprodIter).actions.at(i).action = newLsystem->productions[sstringToString(actionName)];
                                         } else {
                                                 //delete this action
-                                                (*subprodIter).actions.erase(actionIter);
+                                                (*subprodIter).actions.erase((*subprodIter).actions.begin() + i);
                                         }
                                 }