Testing slightly different variant

modelon-community · Dec 1, 2023 · a5a62ed · a5a62ed
1 parent 38235b9
commit a5a62ed
Showing 1 changed file with 9 additions and 17 deletions.
diff --git a/src/pyfmi/fmi.pyx b/src/pyfmi/fmi.pyx
@@ -8363,26 +8363,18 @@ cdef class FMUModelME2(FMUModelBase2):
                         nominals_pt[i] = self.get_variable_nominal(valueref = v_ref_pt[i])
 
             for i in range(len_v):
-                eps_pt[i] = RUROUND*(max(abs(v_pt[i]), RRUROUND))
+                eps_pt[i] = max((N.nextafter(abs(v_pt[i]), N.inf)-abs(v_pt[i]))/RUROUND, RUROUND*2**(-9))
                 if N.sign(v_pt[i]):
-                    eps_pt[i] *= N.sign(v_pt[i])                     
-                    if abs(v_pt[i])/2 <= abs(v_pt[i] + eps_pt[i]) <= 2*abs(v_pt[i]):
-                        temp = v_pt[i] + eps_pt[i]      
-                        eps_pt[i] = temp - v_pt[i]
-                    elif abs(v_pt[i])/2 <= abs(v_pt[i] - eps_pt[i]) <= 2*abs(v_pt[i]):
-                        temp = v_pt[i] - eps_pt[i]
-                        eps_pt[i] = temp - v_pt[i]
+                    eps_pt[i] *= N.sign(v_pt[i])
+                temp = v_pt[i] + eps_pt[i]
+                eps_pt[i] = temp - v_pt[i]
         else:
             for i in range(len_v):
-                eps_pt[i] = RUROUND*(max(abs(v_pt[i]), RRUROUND))
+                eps_pt[i] = max((N.nextafter(abs(v_pt[i]), N.inf)-abs(v_pt[i]))/RUROUND, RUROUND*2**(-9))
                 if N.sign(v_pt[i]):
-                    eps_pt[i] *= N.sign(v_pt[i])                     
-                    if abs(v_pt[i])/2 <= abs(v_pt[i] + eps_pt[i]) <= 2*abs(v_pt[i]):
-                        temp = v_pt[i] + eps_pt[i]      
-                        eps_pt[i] = temp - v_pt[i]
-                    elif abs(v_pt[i])/2 <= abs(v_pt[i] - eps_pt[i]) <= 2*abs(v_pt[i]):
-                        temp = v_pt[i] - eps_pt[i]
-                        eps_pt[i] = temp - v_pt[i]
+                    eps_pt[i] *= N.sign(v_pt[i])
+                temp = v_pt[i] + eps_pt[i]
+                eps_pt[i] = temp - v_pt[i]
 
 
         if group is not None:
@@ -8960,4 +8952,4 @@ cdef class WorkerClass2:
         elif index == 3:
             ret = <FMIL.fmi2_value_reference_t*>PyArray_DATA(self._tmp4_ref)
 
-        return ret
+        return ret