Changeset 26 for cpp/f8-to-f1/conv_f8tof1.cpp

Timestamp:

06/29/09 22:12:09 (15 years ago)

Author:

mwajcht

Message:

Added some comments to converter classes

File:

• cpp/f8-to-f1/conv_f8tof1.cpp (modified) (13 diffs)

cpp/f8-to-f1/conv_f8tof1.cpp

@@ -366 +366 @@
         SString s = SString::valueOf(params[0]);
 #if CONV_DEBUG > 1
-        cout << "@@@@@ Wartosc parametru: " << this->paramName << ": " << params[0] << endl;
+        cout << "@@@@@ Param value: " << this->paramName << ": " << params[0] << endl;
 #endif
         return s;
@@ -414 +414 @@
 }
 
-/**
- * Zwracamy puste, bo co innego mamy zrobić?
- */
 const SString Production::getF1Genotype(const vector<double> params) {
-        return SString("");
+        return SString(); //return empty
 }
 
@@ -430 +427 @@
         }
         
-        //jedziemy po podprodukcjach
+        //iterate through subproductions
         for (vector<SubProduction>::iterator subProdIter = this->subproductions.begin();
                  subProdIter != this->subproductions.end(); subProdIter++) {
@@ -438 +435 @@
                 SubProduction &sp = *subProdIter;
                 bool conditionsOK = true;
-                //sprawdzenie warunków dla danej podprodukcji
+                //check conditions of subproduction
                 for (vector<Condition>::iterator condIter = sp.conditions.begin();
                          condIter != sp.conditions.end(); condIter++) {
                         if (conditionsOK == false) {
-                                break; //bo dalsze sprawdzanie i tak nie ma sensu
+                                break; //because it's no use checking further
                         }
                         Condition &c = *condIter;
@@ -479 +476 @@
                 }
                 if (conditionsOK) {
-                        //jedziemy po każdej akcji w danej podprodukcji
+                        //iterate through each action in subproduction
                         for (int i = 0; i < sp.actions.size(); i++) {
 #if CONV_DEBUG > 1
@@ -487 +484 @@
                                 vector<SString> strParams = sp.actions[i].params;
                                 vector<double> params;
-                                //podmieniamy nazwy parametrów na ich wartości
+                                //replace parameter names with values
                                 for (vector<SString>::iterator paramIter = strParams.begin();
                                          paramIter != strParams.end(); paramIter++) {
@@ -527 +524 @@
         while (in.getNextToken(pos, line, '\n')) {
 #if CONV_DEBUG > 1
-                std::cout << "### Linia: " << line << std::endl;
+                std::cout << "### Line: " << line << std::endl;
 #endif
                 if (line.startsWith("P") && line.indexOf('(', 0) == -1) {
@@ -540 +537 @@
                         SString prodName = line.substr(0, lParenIndex);
 #if CONV_DEBUG > 1
-                        std::cout << "###Produkcja: " << prodName << std::endl;
+                        std::cout << "###Production: " << prodName << std::endl;
 #endif
                         names.push_back(prodName);
@@ -599 +596 @@
         
         //cout << "convert() 1" << endl;
-        //ustawienie zmiennych dla początkowej produkcji
+        //set parameters for start production
         Production *firstProduction = lsystem->productions[lsystem->firstProductionName];
         vector<double> params;
@@ -674 +671 @@
         Lsystem *lsys = new Lsystem();
         
-        //wczytujemy nazwy produkcji i tworzymy wstępnie dla nich obiekty
+        //read production names and create objects for them
         vector<SString> names = this->readProductionNames(in);
         for (vector<SString>::iterator nameIter = names.begin(); nameIter != names.end(); nameIter++) {
@@ -699 +696 @@
 #if CONV_DEBUG > 1
         
-        cout << "@@@@@ Przeparsowane" << endl;
+        cout << "@@@@@ Parsed" << endl;
         
         cout << "&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&" << endl;
@@ -726 +723 @@
 
 bool GenoConv_F8ToF1::parseInput(const char* src, Lsystem* lsys) {
-        //inicjalizacja zmiennych parsera
+        //initialize parser
         int yv;
         istringstream input;
@@ -739 +736 @@
         extern YYSTYPE yylval;
         
-        //parsowanie wejścia
+        //parse input
         // on EOF yylex will return 0
         while((yv = scanner.yylex()) != 0) {