Changeset 973 for cpp/frams/_demos/simil_test.cpp

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

File:

• cpp/frams/_demos/simil_test.cpp (modified) (5 diffs)

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);