Changeset 25563 for branches/pap/psModules/src/objects/models/pmModel_PS1_V1.c

Timestamp:

Sep 24, 2009, 4:02:05 PM (17 years ago)

Author:

Paul Price

Message:

Adding option to ignore limits. PM_MODEL_LIMITS_NONE allows catching application of limits when none is desired. PM_MODEL_LIMITS_IGNORE ignores all application of limits.

File:

• branches/pap/psModules/src/objects/models/pmModel_PS1_V1.c (modified) (3 diffs)

branches/pap/psModules/src/objects/models/pmModel_PS1_V1.c

@@ -56 +56 @@
 static float betaUse[] = { 1000, 3e6, 5, 5, 1.0, 1.0, 0.5, 2.0 };
 
+static bool limitsApply = true;         // Apply limits?
+
 
 psF32 PM_MODEL_FUNC (psVector *deriv,
@@ -109 +111 @@
 bool PM_MODEL_LIMITS (psMinConstraintMode mode, int nParam, float *params, float *beta)
 {
+    if (!limitsApply) {
+        return true;
+    }
     psAssert(nParam >= 0 && nParam <= PM_PAR_7, "Parameter index is out of bounds");
 
@@ -436 +441 @@
         paramsMinUse = NULL;
         paramsMaxUse = NULL;
+        limitsApply = true;
+        break;
+      case PM_MODEL_LIMITS_IGNORE:
+        paramsMinUse = NULL;
+        paramsMaxUse = NULL;
+        limitsApply = false;
       case PM_MODEL_LIMITS_LAX:
         paramsMinUse = paramsMinLax;
         paramsMaxUse = paramsMaxLax;
+        limitsApply = true;
         break;
       case PM_MODEL_LIMITS_STRICT:
         paramsMinUse = paramsMinStrict;
         paramsMaxUse = paramsMaxStrict;
+        limitsApply = true;
         break;
       default: