[iss-258]

Squashed commit of the following: commit f981c15 Author: joaquin.f.fernandez <[email protected]> Date: Tue Aug 27 14:53:20 2024 -0300 Added mmoc system test. commit e6aea70 Author: joaquin.f.fernandez <[email protected]> Date: Tue Aug 27 14:52:55 2024 -0300 Update vs code settings file. commit 1d75351 Author: joaquin.f.fernandez <[email protected]> Date: Tue Aug 27 14:52:41 2024 -0300 Added engine system test. commit a9cc65d Author: joaquin.f.fernandez <[email protected]> Date: Tue Aug 27 09:42:54 2024 -0300 Fixed dq approximation error on recompute next time for QSS method. commit a2c4967 Author: joaquin.f.fernandez <[email protected]> Date: Tue Aug 27 09:42:16 2024 -0300 Added macro definition for dq approximation value.
CIFASIS · Aug 27, 2024 · eb9521c · eb9521c
1 parent 1777b45
commit eb9521c
Show file tree

Hide file tree

Showing 23 changed files with 10,776 additions and 50 deletions.
diff --git a/src/engine/.vscode/settings.json b/src/engine/.vscode/settings.json
@@ -1,6 +1,7 @@
 {
     "files.associations": {
-        "random": "cpp"
+        "random": "cpp",
+        "qss_bdf.h": "c"
     },
     "C_Cpp.dimInactiveRegions": true
 }
diff --git a/src/engine/common/macros.h b/src/engine/common/macros.h
@@ -30,6 +30,11 @@
   typedef struct type##_ *type; \
   typedef const struct type##_ *const_##type;
 
+/// Define a minimum approximation of DQ used in QSS methods when
+/// recomputing state variables next times, to avoid numerical
+/// errors. @see https://github.com/CIFASIS/qss-solver/issues/258
+#define DQ_APPROX 0.999999999
+
 #ifdef QSS_PARALLEL
 
 #define QSS_FUNC_DECL(module, name) module##_##PAR_##name

diff --git a/src/engine/qss/methods/qss.c b/src/engine/qss/methods/qss.c
@@ -39,13 +39,17 @@ void QSS_FUNC_DECL(QSS, recomputeNextTime)(QA_quantizer quantizer, int var, doub
 {
   int cf0 = var * 2, cf1 = cf0 + 1;
   double coeff[2];
-  coeff[0] = q[cf0] - x[cf0] - lqu[var];
-  coeff[1] = -x[cf1];
-  nTime[var] = t + minPosRoot(coeff, 1);
-  coeff[0] = q[cf0] - x[cf0] + lqu[var];
-  double timeaux = t + minPosRoot(coeff, 1);
-  if (timeaux < nTime[var]) {
-    nTime[var] = timeaux;
+  if (fabs(q[cf0] - x[cf0]) >= lqu[var] * DQ_APPROX) {
+    nTime[var] = t;
+  } else {
+    coeff[0] = q[cf0] - x[cf0] - lqu[var];
+    coeff[1] = -x[cf1];
+    nTime[var] = t + minPosRoot(coeff, 1);
+    coeff[0] = q[cf0] - x[cf0] + lqu[var];
+    double timeaux = t + minPosRoot(coeff, 1);
+    if (timeaux < nTime[var]) {
+      nTime[var] = timeaux;
+    }
   }
 }
 

diff --git a/src/engine/qss/methods/qss2.c b/src/engine/qss/methods/qss2.c
@@ -51,7 +51,7 @@ void QSS_FUNC_DECL(QSS2, recomputeNextTime)(QA_quantizer quantizer, int var, dou
 {
   int cf0 = var * 3, cf1 = cf0 + 1, cf2 = cf1 + 1;
   double coeff[3];
-  if (fabs(q[cf0] - x[cf0]) >= lqu[var] * 0.999999999) {
+  if (fabs(q[cf0] - x[cf0]) >= lqu[var] * DQ_APPROX) {
     nTime[var] = t;
   } else {
     coeff[0] = q[cf0] + lqu[var] - x[cf0];

diff --git a/src/engine/qss/methods/qss3.c b/src/engine/qss/methods/qss3.c
@@ -56,7 +56,7 @@ void QSS_FUNC_DECL(QSS3, recomputeNextTime)(QA_quantizer quantizer, int var, dou
 {
   int cf0 = var * 4, cf1 = cf0 + 1, cf2 = cf1 + 1, cf3 = cf2 + 1;
   double coeff[4];
-  if (fabs(q[cf0] - x[cf0]) >= lqu[var] * 0.999999999) {
+  if (fabs(q[cf0] - x[cf0]) >= lqu[var] * DQ_APPROX) {
     nTime[var] = t;
   } else {
     coeff[0] = q[cf0] + lqu[var] - x[cf0];

diff --git a/src/engine/qss/methods/qss4.c b/src/engine/qss/methods/qss4.c
@@ -55,7 +55,7 @@ void QSS_FUNC_DECL(QSS4, recomputeNextTime)(QA_quantizer quantizer, int var, dou
 {
   int cf0 = var * 5, cf1 = cf0 + 1, cf2 = cf1 + 1, cf3 = cf2 + 1, cf4 = cf3 + 1;
   double coeff[5];
-  if (fabs(q[cf0] - x[cf0]) >= lqu[var] * 0.999999999) {
+  if (fabs(q[cf0] - x[cf0]) >= lqu[var] * DQ_APPROX) {
     nTime[var] = t;
   } else {
     coeff[0] = q[cf0] + lqu[var] - x[cf0];