Changeset 1130 for cpp/frams/model/autoname.cpp

Timestamp:

04/16/21 15:55:34 (4 years ago)

Author:

Maciej Komosinski

Message:

Used std::min(), std::max() explicitly to avoid compiler confusion. Used std::size() explicitly instead of the equivalent macro

File:

• cpp/frams/model/autoname.cpp (modified) (5 diffs)

cpp/frams/model/autoname.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
 #include "autoname.h"
-#include "common/nonstd_stl.h"
+#include <algorithm>
 #include <ctype.h>
 
@@ -100 +100 @@
         if (model.getPartCount() > 0)
         {
-                cialo = min((int)(sqrt(double(model.getPartCount()) - 1) * NAME_BODYLEN), NAME_MAXLENBODY - 1);
+                cialo = std::min((int)(sqrt(double(model.getPartCount()) - 1) * NAME_BODYLEN), NAME_MAXLENBODY - 1);
                 poz = 0;
                 for (i = 0; i <= cialo; i++) // budowanie "opisu" ciala
@@ -106 +106 @@
                         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)];
+                        for (; poz <= nextpoz; poz++) w = std::max(w, model.getPart(poz)->mass);
+                        tmpc[i] = Sp[std::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 = std::min((int)(sqrt((double)model.getNeuroCount()) * NAME_BRAINLEN), NAME_MAXLENBRAIN - 1);
                 poz = 0;
                 for (i = 0; i <= mozg; i++) // budowanie "opisu" mozgu
@@ -123 +123 @@
                         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)];
+                        for (; poz <= nextpoz; poz++) wint = std::max(wint, model.getNeuro(poz)->getInputCount());
+                        tmpm[i] = Sam[std::min(int(wint * NAME_BRAININP), int(sizeof(Sam)) - 2)];
                 }
                 tmpm[i] = 0;