- adjust event creation to deal with missing data

copasi · Mar 3, 2015 · 7630d60 · 7630d60
1 parent 13fe719
commit 7630d60
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/copasi/UI/copasiui3window.cpp b/copasi/UI/copasiui3window.cpp
@@ -1666,8 +1666,19 @@ void CopasiUI3Window::slotCreateEventsForTimeseries()
       // Display error messages.
       CQMessageBox::information(this, "Event Creation Failed",
                                 CCopasiMessage::getAllMessageText().c_str(),
-                                QMessageBox::Ok | QMessageBox::Default,
-                                QMessageBox::NoButton);
+                                QMessageBox::Ok,
+                                QMessageBox::Ok);
+      CCopasiMessage::clearDeque();
+    }
+
+  // show any warning messages that occured
+  if (CCopasiMessage::size() != 0)
+    {
+      // Display warnings messages.
+      CQMessageBox::information(this, "Event Creation succeded with warnings",
+                                CCopasiMessage::getAllMessageText().c_str(),
+                                QMessageBox::Ok,
+                                QMessageBox::Ok);
       CCopasiMessage::clearDeque();
     }
 

diff --git a/copasi/model/CModel.cpp b/copasi/model/CModel.cpp
@@ -3132,6 +3132,16 @@ CModel::createEventsForTimeseries(CExperiment* experiment/* = NULL*/)
 
           double value = data(i, j);
 
+          // don't include missing data points
+          if (value != value)
+            {
+              std::string displayName = currentObject->getObjectParent()->getObjectDisplayName();
+              CCopasiMessage(CCopasiMessage::WARNING,
+                             "At time %.2f: a missing data point was encountered for '%s', the value has been ignored."
+                             , current, displayName.c_str());
+              continue;
+            }
+
           CEventAssignment * pNewAssignment =
             new CEventAssignment(currentObject->getObjectParent()->getKey());
           std::stringstream assignmentStr; assignmentStr << value;