Changeset 1253 for cpp

Timestamp:

06/22/23 03:27:28 (10 months ago)

Author:

Maciej Komosinski

Message:

Turn -0.0 to 0.0 when the allowed range starts at 0.0

Location:

cpp

Files:

• common/nonstd_math.h (modified) (1 diff)
• frams/param/param.cpp (modified) (6 diffs)

cpp/common/nonstd_math.h

@@ -38 +38 @@
 std::string doubleToString(double x, int precision);
 double round(const double x, const int precision);
+static inline void clipNegativeZeroIfNeeded(double& value, const double range_low)
+{
+        if (value == 0.0 && range_low == 0.0) // if we have range_low==0.0 and we get value==-0.0 (which is ==0.0)
+                value = 0.0; //turn -0.0 to 0.0 so that it does not look like exceeding the allowed range (even though -0.0==0.0). This code unnecessarily also "overwrites" value==0.0 with 0.0, but it is faster and simpler than additionally checking std::signbit(value) just to distinguish -0.0 from 0.0.
+        //these conditions are not intended for range_low==-0.0, as we assume nobody would define allowed ranges using -0.0.
+}
 
 

cpp/frams/param/param.cpp

@@ -11 +11 @@
 #include <frams/util/sstringutils.h>
 #include <common/virtfile/stringfile.h>
+#include <common/nonstd_math.h>
 
 #ifdef _DEBUG
@@ -358 +359 @@
 {
         SString ret = getName();
-        if (ret.size()>0) //name might be unavailable, happened in GenMan sub-Params
+        if (ret.size() > 0) //name might be unavailable, happened in GenMan sub-Params
                 ret += ".";
         ret += id(prop);
@@ -367 +368 @@
 {
         SString name_dot_prop = nameDotProperty(prop);
-        if (getName()==NULL || getLongName()==NULL) //name/longname might be unavailable, happened in GenMan sub-Params
+        if (getName() == NULL || getLongName() == NULL) //name/longname might be unavailable, happened in GenMan sub-Params
                 return name_dot_prop;
-        
+
         if (strcmp(getName(), getLongName()) == 0)
         {
@@ -422 +423 @@
         // t+=SString(getName()); t+=':';
         for (i = 0; p = id(i); i++)
-                if ((!((fl = flags(i)) & PARAM_DONTSAVE)) && type(i)[0]!='p')
+                if ((!((fl = flags(i)) & PARAM_DONTSAVE)) && type(i)[0] != 'p')
                 {
                         if (defdata && isequal(i, defdata))
@@ -716 +717 @@
 int ParamInterface::findGroupId(const char* name)
 {
-for(int i=0;i<getGroupCount();i++)
-        if (!strcmp(grname(i),name))
-                return i;
-return -1;
+        for (int i = 0; i < getGroupCount(); i++)
+                if (!strcmp(grname(i), name))
+                        return i;
+        return -1;
 }
 
@@ -1131 +1132 @@
                         if (x < mn) { x = mn; result = PSET_HITMIN; }
                         else if (x > mx) { x = mx; result = PSET_HITMAX; }
+                        clipNegativeZeroIfNeeded(x, mn);  //by the official standard, 0.0 == -0.0 and so it is not true that -0.0 < 0.0, so -0.0 would not be clipped to 0.0, i.e., if we defined the allowed range to be, for example, [0.0, 1.0], then without this call, x==-0.0 would be accepted. Since we never allow x==-0.0 for mn==0 past this point, we don't need to check below if the value changed from -0.0 to 0.0 (which would require comparing old and new std::signbit(x) etc.), because -0.0 could have never been set earlier.
                 }