Changeset 1005 for cpp/frams

Timestamp:

07/14/20 15:54:43 (4 years ago)

Author:

Maciej Komosinski

Message:

Higher conformance with C++17, but gave up after missing M_PI, M_PI_2, strdup() and more; other cosmetic improvements

Location:

cpp/frams

Files:

• _demos/simil_test.cpp (modified) (4 diffs)
• genetics/f9/f9_oper.cpp (modified) (1 diff)
• param/paramobj.cpp (modified) (2 diffs)
• util/extvalue.cpp (modified) (1 diff)

cpp/frams/_demos/simil_test.cpp

@@ -19 +19 @@
 {
         LoggerToStdout messages_to_stdout(LoggerBase::Enable);
-        typedef double *pDouble;
         int iCurrParam = 0; // index of the currently processed parameter
         char *szCurrParam = NULL;
@@ -172 +171 @@
         double **aaSimil = NULL; // array of similarities
 
-        // create the empty array of similarities
-        aaSimil = new pDouble[pvGenos.size()];
+        // create an empty array of similarities
+        aaSimil = new double*[pvGenos.size()];
         for (unsigned int k = 0; k < pvGenos.size(); k++)
         {
@@ -181 +180 @@
         }
 
-        // compute and remember similarities
+        // compute and store similarities
         for (unsigned int i = 0; i < pvGenos.size(); i++)
         {
@@ -193 +192 @@
         if (bPrintNames)
         {
-                // if "-names" switch was given, print the number of genotypes and their names
+                // if the "-names" switch was given, print the number of genotypes and their names
                 printf("%li\n", pvGenos.size());
                 for (unsigned int iGen = 0; iGen < pvNames.size(); iGen++)

cpp/frams/genetics/f9/f9_oper.cpp

@@ -6 +6 @@
 #include "f9_conv.h"
 #include <common/nonstd.h> //rndUint, rndDouble
+#include <string.h>
 
 

cpp/frams/param/paramobj.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.
 
@@ -6 +6 @@
 #include <frams/util/extvalue.h>
 #include <common/nonstd_stl.h>
-
+        
 static const char* maybedup(bool dup, const char* src)
 {

cpp/frams/util/extvalue.cpp

@@ -705 +705 @@
                 fpExceptDisable();
                 double tmp = getDouble() / a;
-                if (!finite(tmp))
+                if (!std::isfinite(tmp))
                 {
                         logPrintf("ExtValue", "divide", LOG_ERROR, "Overflow %s/%g", getString().c_str(), a); setInvalid();