Changeset 973 for cpp/frams/_demos

Timestamp:

07/03/20 00:37:13 (4 years ago)

Author:

Maciej Komosinski

Message:

Increased SString and std::string compatibility: introduced length(), size(), and capacity(), and removed legacy methods that have std::string equivalents

Location:

cpp/frams/_demos

Files:

• genooper_test.cpp (modified) (2 diffs)
• loader_test_geno.cpp (modified) (5 diffs)
• paramtree_stdin_test.cpp (modified) (1 diff)
• printconvmap.cpp (modified) (4 diffs)
• simil_test.cpp (modified) (5 diffs)

cpp/frams/_demos/genooper_test.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -9 +9 @@
 {
         printf("Genotype: %s\nFormat: %s\nValid: %s\nComment: %s\n",
-                g.getGenes().c_str(), g.getFormat().c_str(), g.isValid() ? "yes" : "no", g.getComment().len() == 0 ? "(empty)" : g.getComment().c_str());
+                g.getGenes().c_str(), g.getFormat().c_str(), g.isValid() ? "yes" : "no", g.getComment().length() == 0 ? "(empty)" : g.getComment().c_str());
 }
 

cpp/frams/_demos/loader_test_geno.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -20 +20 @@
                         "If a genotype is indicated (by providing the optional genotype identifier), the program will output the raw genotype, suitable for Framsticks Theater's genotype viewer mode. If a genotype and a field name is given, the field value (instead of the raw genotype) is printed. If the second argument is not given, the genotype names from the file will be listed.\n"
                         "Example: loader_test walking.gen \"Basic Quadruped\" | theater -g -\n"
-                        );
+                );
                 return 1;
         }
@@ -29 +29 @@
         const char* selected = (argc < 3) ? NULL : argv[2];
         const char* field_name = (argc < 4) ? NULL : argv[3];
-        int selected_index = (selected&&isdigit(selected[0])) ? atol(selected) : 0;
+        int selected_index = (selected && isdigit(selected[0])) ? atol(selected) : 0;
         // using char* constructor (passing the file name to open)
         GenotypeMini *loaded;
@@ -36 +36 @@
                 // loaded into MiniGenotype object
                 count++;
-                totalsize += loaded->genotype.len();
+                totalsize += loaded->genotype.length();
                 if (selected)
                 {
@@ -65 +65 @@
                         return 0;
                 }
-                fprintf(stderr, "%d. %s\t(%d characters)\n", count, loaded->name.c_str(), loaded->genotype.len());
+                fprintf(stderr, "%d. %s\t(%d characters)\n", count, loaded->name.c_str(), loaded->genotype.length());
         }
         // the loop repeats until loaded==NULL, which could be beacause of error

cpp/frams/_demos/paramtree_stdin_test.cpp

@@ -45 +45 @@
         while (group_names.getNextToken(pos, line, '\n'))
         {
-                if ((line.len() > 0) && (line[line.len() - 1] == '\r')) //support for reading \r\n files...
-                        line = line.substr(0, line.len() - 1);
-                if (line.len() > 0 && line[0] != '#') //skip empty lines and #commment lines
+                if ((line.length() > 0) && (line[line.length() - 1] == '\r')) //support for reading \r\n files...
+                        line = line.substr(0, line.length() - 1);
+                if (line.length() > 0 && line[0] != '#') //skip empty lines and #commment lines
                         param.addGroup(line.c_str());
         }

cpp/frams/_demos/printconvmap.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -48 +48 @@
                 return;
         }
-        len1 = gen1.len();
+        len1 = gen1.length();
         SString g1 = gen1;
         stripstring(g1);
@@ -73 +73 @@
                         y2 = len1;
                 }
-                else    {
+                else {
                         id = map.findMappingId(y);
                         mr = &map.getMapping(id)->to;
@@ -80 +80 @@
                 if ((y2 - y) > left_column_padding) y2 = y + left_column_padding;
                 if (y2 > (y + len1)) y2 = y + len1;
-                printmapping(g + y, y2 - y, *mr, g2.c_str(), g2.len(), left_column_padding);
+                printmapping(g + y, y2 - y, *mr, g2.c_str(), g2.length(), left_column_padding);
                 y = y2;
         }

cpp/frams/_demos/simil_test.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -78 +78 @@
                 M.m_adFactors[i] = -1.0;
         }
-        
+
         iCurrParam++;
         szCurrParam = argv[iCurrParam];
-        int measure_type = -1; 
+        int measure_type = -1;
         nResult = sscanf(szCurrParam, "%d", &measure_type);
         if (nResult != 1)
@@ -88 +88 @@
                 return -1;
         }
-        
+
         if (measure_type != 0 && measure_type != 1)
         {
                 printf("Measure type should be 0 (flexible criteria order and optimal matching) or 1 (vertex degree order and greedy matching)!\n");
-                return -1;              
-        }
-        
+                return -1;
+        }
+
         M.matching_method = measure_type;
 
@@ -150 +150 @@
                 // while a valid genotype was loaded
                 count++;
-                totalsize += loaded->genotype.len();
+                totalsize += loaded->genotype.length();
                 // create a Geno object based on the MiniGenotype
                 Geno *pNextGenotype = new Geno(loaded->genotype);
@@ -156 +156 @@
                 {
                         pvGenos.push_back(pNextGenotype);
-                        char *szNewName = new char[loaded->name.len() + 1];
+                        char *szNewName = new char[loaded->name.length() + 1];
                         strcpy(szNewName, loaded->name.c_str());
                         pvNames.push_back(szNewName);