Merge pull request #1241 from veg/develop

Incorrect variable untagging in Optimize
veg · Oct 30, 2020 · 01301fd · 01301fd
2 parents 1c6e1d7 + 0ff20b1
commit 01301fd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/core/include/variable.h b/src/core/include/variable.h
@@ -143,6 +143,7 @@ class _Variable : public _Constant {
     virtual     bool        CheckFForDependence (_AVLList const&, bool = false);
     virtual     bool        HasBeenInitialized (void) const {return !(varFlags & HY_VARIABLE_NOTSET);}
     virtual     void        MarkModified  (void) {varFlags = varFlags | HY_VARIABLE_CHANGED;}
+    virtual     bool        IsModified  (void) const {return varFlags & HY_VARIABLE_CHANGED;}
     virtual     void        ClearModified  (void) {if (varFlags & HY_VARIABLE_CHANGED) varFlags -= HY_VARIABLE_CHANGED;}
 
     _String const     ContextFreeName                 (void) const;

diff --git a/src/core/likefunc.cpp b/src/core/likefunc.cpp
@@ -4126,11 +4126,16 @@ _Matrix*        _LikelihoodFunction::Optimize (_AssociativeList const * options)
          }
     }
 
+
+    _SimpleList untag;
     if (keepStartingPoint) {
-        indexInd.Each ([this] (long v, unsigned long i) -> void {
+        indexInd.Each ([this, &untag] (long v, unsigned long i) -> void {
             _Variable *iv = GetIthIndependentVar (i);
             if (iv->HasBeenInitialized()) {
-                iv->MarkModified();
+                if (!iv->IsModified()) {
+                    iv->MarkModified();
+                    untag << i;
+                }
             }
         });
     }
@@ -4140,11 +4145,9 @@ _Matrix*        _LikelihoodFunction::Optimize (_AssociativeList const * options)
     }
 
     if (keepStartingPoint) {
-        indexInd.Each ([this] (long v, unsigned long i) -> void {
+        untag.Each ([this] (long v, unsigned long i) -> void {
             _Variable *iv = GetIthIndependentVar (i);
-            if (iv->HasBeenInitialized()) {
-                iv->ClearModified();
-            }
+            iv->ClearModified();
         });
     }