Changeset 973 for cpp/frams/model

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/model

Files:

• autoname.cpp (modified) (6 diffs)
• modelparts.cpp (modified) (6 diffs)

cpp/frams/model/autoname.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.
 
@@ -11 +11 @@
         SString t;
         t = firstName(model);
-        SString last=lastName(model);
-        if (last.len()>0)
-                {
+        SString last = lastName(model);
+        if (last.length() > 0)
+        {
                 t += ' ';
                 t += last;
-                }
+        }
         return t;
 }
@@ -42 +42 @@
         unsigned int s1 = 0, s2 = 0, s3 = 0;
         const char *x = g.c_str();
-        if (*x==0) return SString();
-        for (; *x; x++) { s1 += *x; s2 = s2**x + *x; s3 = (s3^*x) + *x; }
+        if (*x == 0) return SString();
+        for (; *x; x++) { s1 += *x; s2 = s2 * *x + *x; s3 = (s3 ^ *x) + *x; }
         char* t = buf;
         t = cat_syl(t, s1);
@@ -71 +71 @@
                 for (i = 0; i <= pp; i++)
                 {
-                p = (i*d1) / pp - 1; for (; p1 <= p; p1++) *(out++) = *(in1++);
-                p = (i*d2) / pp - 1; for (; p2 <= p; p2++) *(out++) = *(in2++);
+                        p = (i * d1) / pp - 1; for (; p1 <= p; p1++) *(out++) = *(in1++);
+                        p = (i * d2) / pp - 1; for (; p2 <= p; p2++) *(out++) = *(in2++);
                 }
         *out = 0;
@@ -100 +100 @@
         if (model.getPartCount() > 0)
         {
-                cialo = min((int)(sqrt(double(model.getPartCount()) - 1)*NAME_BODYLEN), NAME_MAXLENBODY - 1);
+                cialo = min((int)(sqrt(double(model.getPartCount()) - 1) * NAME_BODYLEN), NAME_MAXLENBODY - 1);
                 poz = 0;
                 for (i = 0; i <= cialo; i++) // budowanie "opisu" ciala
                 {
-                        nextpoz = ((model.getPartCount())*(i + 1)) / (cialo + 1) - 1;
+                        nextpoz = ((model.getPartCount()) * (i + 1)) / (cialo + 1) - 1;
                         w = 1.0;
                         for (; poz <= nextpoz; poz++) w = max(w, model.getPart(poz)->mass);
-                        tmpc[i] = Sp[min(int((w - 1.0)*NAME_BODYMASS), int(sizeof(Sp)) - 2)];
+                        tmpc[i] = Sp[min(int((w - 1.0) * NAME_BODYMASS), int(sizeof(Sp)) - 2)];
                 }
                 tmpc[i] = 0;
@@ -117 +117 @@
         if (model.getNeuroCount() > 0)
         {
-                mozg = min((int)(sqrt((double)model.getNeuroCount())*NAME_BRAINLEN), NAME_MAXLENBRAIN - 1);
+                mozg = min((int)(sqrt((double)model.getNeuroCount()) * NAME_BRAINLEN), NAME_MAXLENBRAIN - 1);
                 poz = 0;
                 for (i = 0; i <= mozg; i++) // budowanie "opisu" mozgu
                 {
-                        nextpoz = (model.getNeuroCount()*(i + 1)) / (mozg + 1) - 1;
+                        nextpoz = (model.getNeuroCount() * (i + 1)) / (mozg + 1) - 1;
                         wint = 0;
                         for (; poz <= nextpoz; poz++) wint = max(wint, model.getNeuro(poz)->getInputCount());
-                        tmpm[i] = Sam[min(int(wint*NAME_BRAININP), int(sizeof(Sam)) - 2)];
+                        tmpm[i] = Sam[min(int(wint * NAME_BRAININP), int(sizeof(Sam)) - 2)];
                 }
                 tmpm[i] = 0;

cpp/frams/model/modelparts.cpp

@@ -149 +149 @@
         SString t;
         t = getDescription();
-        if (t.len()) t += "\n\n";
+        if (t.length()) t += "\n\n";
         t += "Characteristics:\n";
         if (getPreferredInputs())
@@ -171 +171 @@
         if (p.getPropCount())
         {
-                if (t.len()) t += "\n\n";
+                if (t.length()) t += "\n\n";
                 t += "Properties:\n";
                 const char *h;
@@ -341 +341 @@
 {
         SString ret = getClassName();
-        if (myclassparams.len()) { if (!ret.len()) ret = "N"; ret += ":"; ret += myclassparams; }
+        if (myclassparams.length()) { if (!ret.length()) ret = "N"; ret += ":"; ret += myclassparams; }
         return ret;
 }
@@ -372 +372 @@
 int Neuro::addInput(Neuro *child, double weight, const SString *info)
 {
-        inputs += NInput(child, weight, (info && (info->len())) ? new SString(*info) : 0);
+        inputs += NInput(child, weight, (info && (info->length())) ? new SString(*info) : 0);
         child->parentcount++;
         if (child->parentcount == 1) { child->parent = this; }
@@ -759 +759 @@
                 ParamEntry entries[] = {
                  { "class", 2, 0, "neuro class", "s", GETSET(neuroclass) },
-                 { "liveNeuro", 2, 1, "live Neuro object", "oNeuro", GETONLY(liveNeuro) }};
+                 { "liveNeuro", 2, 1, "live Neuro object", "oNeuro", GETONLY(liveNeuro) } };
 #undef FIELDSTRUCT
-                for(auto& e : entries) add(&e);
+                for (auto& e : entries) add(&e);
 
 #define FIELDSTRUCT Neuro
@@ -804 +804 @@
 {
 #ifndef SDK_WITHOUT_FRAMS
-        NeuroNetImpl::getLiveNeuroObject(this,ret);
+        NeuroNetImpl::getLiveNeuroObject(this, ret);
 #endif
 }