Bug 3248: Fixed test_api failures.

copasi · Jun 25, 2024 · 26c3095 · 26c3095
1 parent e8cd4cc
commit 26c3095
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -83,3 +83,5 @@ python_copasi.egg-info
 /copasi-dependencies
 TestSuite/distribution/out.txt
 .~lock*
+
+tests/opt.cps
diff --git a/copasi/CopasiDataModel/CDataModel.cpp b/copasi/CopasiDataModel/CDataModel.cpp
@@ -1082,9 +1082,14 @@ bool CDataModel::newModel(CProcessReport * pProcessReport,
   // set content type to COPASI
   mData.mContentType = ContentType::COPASI;
 
-  CRegisteredCommonName::setEnabled(false);
-  commonAfterLoad(pProcessReport, deleteOldData);
-  CRegisteredCommonName::setEnabled(true);
+  if (CRegisteredCommonName::isEnabled())
+    {
+      CRegisteredCommonName::setEnabled(false);
+      commonAfterLoad(pProcessReport, deleteOldData);
+      CRegisteredCommonName::setEnabled(true);
+    }
+  else
+    commonAfterLoad(pProcessReport, deleteOldData);
 
   return true;
 }

diff --git a/copasi/core/CRootContainer.cpp b/copasi/core/CRootContainer.cpp
@@ -91,13 +91,17 @@ void CRootContainer::init(int argc, char *argv[], const bool & withGUI)
 {
   COptions::init(argc, argv);
 
+  CRegisteredCommonName::setEnabled(false);
+
   CCopasiMessage::setIsGUI(withGUI);
 
   if (pRootContainer == NULL)
     pRootContainer = new CRootContainer(withGUI);
 
   if (pRootContainer != NULL)
     pRootContainer->initializeChildren();
+
+  CRegisteredCommonName::setEnabled(true);
 }
 
 // static

diff --git a/copasi/function/CEvaluationNodeObject.cpp b/copasi/function/CEvaluationNodeObject.cpp
@@ -70,10 +70,14 @@ CEvaluationNodeObject::CEvaluationNodeObject(const SubType & subType,
             mSubType = SubType::AVOGADRO;
           }
 
+        mRegisteredObjectCN = CRegisteredCommonName(mData.substr(1, mData.length() - 2), nullptr);
+
         break;
 
       case SubType::AVOGADRO:
         mData = "<Reference=Avogadro Constant>";
+        mRegisteredObjectCN = CRegisteredCommonName(mData.substr(1, mData.length() - 2), nullptr);
+
         break;
 
       case SubType::POINTER: