Added a new interface for data reconciliation (#8257)

* Added a new interface for data reconciliation

* add Message box to validate data Reconciliation

* Default epsilon value

Co-authored-by: arun3688 <rain100falls@gmail.com>

OMEdit/OMEditLIB/MainWindow.h

@@ -171,6 +171,7 @@ class MainWindow : public QMainWindow
   QAction* getCheckModelAction() {return mpCheckModelAction;}
   QAction* getCheckAllModelsAction() {return mpCheckAllModelsAction;}
   QAction* getInstantiateModelAction() {return mpInstantiateModelAction;}
+  QAction* getCalculateDataReconciliationAction() {return mpCalculateDataReconciliationAction;}
   QAction* getExportFMUAction() {return mpExportFMUAction;}
   QAction* getExportEncryptedPackageAction() {return mpExportEncryptedPackageAction;}
   QAction* getExportRealonlyPackageAction() {return mpExportReadonlyPackageAction;}
@@ -367,6 +368,8 @@ class MainWindow : public QMainWindow
 #endif
   QAction *mpSimulateModelInteractiveAction;
   QAction *mpArchivedSimulationsAction;
+  // Data reconciliation action
+  QAction *mpCalculateDataReconciliationAction;
   // Debug Menu
   QAction *mpDebugConfigurationsAction;
   QAction *mpAttachDebuggerToRunningProcessAction;
@@ -558,6 +561,7 @@ private slots:
   void documentationDockWidgetVisibilityChanged(bool visible);
   void threeDViewerDockWidgetVisibilityChanged(bool visible);
   void autoSave();
+  void showDataReconciliationDialog();
   void showDebugConfigurationsDialog();
   void showAttachToProcessDialog();
   void createGitRepository();

OMEdit/OMEditLIB/Modeling/ModelWidgetContainer.cpp

@@ -5316,6 +5316,7 @@ void ModelWidget::reDrawModelWidget()
     loadElements();
     // invalidate the simulation options
     mpLibraryTreeItem->mSimulationOptions.setIsValid(false);
+    mpLibraryTreeItem->mSimulationOptions.setDataReconciliationInitialized(false);
     // update the icon
     mpLibraryTreeItem->handleIconUpdated();
     // Draw diagram view
@@ -8398,6 +8399,7 @@ void ModelWidgetContainer::currentModelWidgetChanged(QMdiSubWindow *pSubWindow)
 #endif
   MainWindow::instance()->getSimulateModelInteractiveAction()->setEnabled(enabled && oms);
   MainWindow::instance()->getSimulationSetupAction()->setEnabled(enabled && ((modelica && pLibraryTreeItem->isSimulationAllowed()) || (oms)));
+  MainWindow::instance()->getCalculateDataReconciliationAction()->setEnabled(enabled && modelica && pLibraryTreeItem->isSimulationAllowed());
   bool accessAnnotation = false;
   if (pLibraryTreeItem && (pLibraryTreeItem->getAccess() >= LibraryTreeItem::packageText
                            || ((pLibraryTreeItem->getAccess() == LibraryTreeItem::nonPackageText

OMEdit/OMEditLIB/Options/OptionsDialog.cpp

@@ -5506,6 +5506,7 @@ void DiscardLocalTranslationFlagsDialog::discardLocalTranslationFlags()
       LibraryTreeItem *pLibraryTreeItem = MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->findLibraryTreeItem(pClassWithLocalTranslationFlags->text());
       if (pLibraryTreeItem) {
         pLibraryTreeItem->mSimulationOptions.setIsValid(false);
+        pLibraryTreeItem->mSimulationOptions.setDataReconciliationInitialized(false);
       }
     }
   }

OMEdit/OMEditLIB/Simulation/SimulationDialog.h

@@ -65,7 +65,7 @@ class SimulationDialog : public QDialog
   SimulationDialog(QWidget *pParent = 0);
   ~SimulationDialog();
   void show(LibraryTreeItem *pLibraryTreeItem, bool isReSimulate, SimulationOptions simulationOptions);
-  void directSimulate(LibraryTreeItem *pLibraryTreeItem, bool launchTransformationalDebugger, bool launchAlgorithmicDebugger, bool launchAnimation);
+  void directSimulate(LibraryTreeItem *pLibraryTreeItem, bool launchTransformationalDebugger, bool launchAlgorithmicDebugger, bool launchAnimation, bool enableDataReconciliation);
   OpcUaClient* getOpcUaClient(int port);
   void removeSimulationOutputWidget(SimulationOutputWidget* pSimulationOutputWidget);
 private:
@@ -171,19 +171,6 @@ class SimulationDialog : public QDialog
   QCheckBox *mpEquidistantTimeGridCheckBox;
   QCheckBox *mpStoreVariablesAtEventsCheckBox;
   QCheckBox *mpShowGeneratedFilesCheckBox;
-  // Data Reconciliation Tab
-  QWidget *mpDataReconciliationTab;
-  QGroupBox *mpDataReconciliationGroupBox;
-  Label *mpDataReconciliationAlgorithmLabel;
-  QComboBox *mpDataReconciliationAlgorithmComboBox;
-  Label *mpDataReconciliationMeasurementInputFileLabel;
-  QLineEdit *mpDataReconciliationMeasurementInputFileTextBox;
-  QPushButton *mpDataReconciliationMeasurementInputFileBrowseButton;
-  Label *mpDataReconciliationCorrelationMatrixInputFileLabel;
-  QLineEdit *mpDataReconciliationCorrelationMatrixInputFileTextBox;
-  QPushButton *mpDataReconciliationCorrelationMatrixInputFileBrowseButton;
-  Label *mpDataReconciliationEpsilonLabel;
-  QLineEdit *mpDataReconciliationEpsilonTextBox;
   // checkboxes
   QCheckBox *mpSaveExperimentAnnotationCheckBox;
   QCheckBox *mpSaveSimulationFlagsAnnotationCheckBox;
@@ -238,10 +225,35 @@ public slots:
   void updateYAxis(double min, double max);
 private slots:
   void resultFileNameChanged(QString text);
-  void browseDataReconciliationMeasurementInputFile();
-  void browseDataReconciliationCorrelationMatrixInputFile();
   void simulationStarted();
   void simulationPaused();
 };
 
+class DataReconciliationDialog : public QDialog
+{
+  Q_OBJECT
+public:
+  explicit DataReconciliationDialog(LibraryTreeItem *pLibraryTreeItem, QDialog *parent = nullptr);
+private:
+  LibraryTreeItem *mpLibraryTreeItem;
+  Label *mpDataReconciliationAlgorithmLabel;
+  QComboBox *mpDataReconciliationAlgorithmComboBox;
+  Label *mpDataReconciliationMeasurementInputFileLabel;
+  QLineEdit *mpDataReconciliationMeasurementInputFileTextBox;
+  QPushButton *mpDataReconciliationMeasurementInputFileBrowseButton;
+  Label *mpDataReconciliationCorrelationMatrixInputFileLabel;
+  QLineEdit *mpDataReconciliationCorrelationMatrixInputFileTextBox;
+  QPushButton *mpDataReconciliationCorrelationMatrixInputFileBrowseButton;
+  Label *mpDataReconciliationEpsilonLabel;
+  QLineEdit *mpDataReconciliationEpsilonTextBox;
+  QCheckBox *mpSaveSettingsCheckBox;
+  QPushButton *mpCalculateButton;
+  QPushButton *mpCancelButton;
+  QDialogButtonBox *mpButtonBox;
+private slots:
+  void browseDataReconciliationMeasurementInputFile();
+  void browseDataReconciliationCorrelationMatrixInputFile();
+  void calculateDataReconciliation();
+};
+
 #endif // SIMULATIONDIALOG_H

OMEdit/OMEditLIB/Simulation/SimulationOptions.h

@@ -77,7 +77,6 @@ class SimulationOptions
     setNLSanalyticJacobian(true);
     setParmodauto(false);
     setOldInstantiation(false);
-    setDataReconciliation(false);
     setAdditionalTranslationFlags("");
     // Simulation
     setModelSetupFile("");
@@ -93,8 +92,10 @@ class SimulationOptions
     setCPUTime(false);
     setEnableAllWarnings(true);
     setEnableDataReconciliation(false);
+    setDataReconciliationMeasurementInputFile("");
     setDataReconciliationCorrelationMatrixInputFile("");
     setDataReconciliationEpsilon("");
+    setDataReconciliationSaveSetting(false);
     setLogStreams(QStringList() << "LOG_STATS");
     setAdditionalSimulationFlags("");
     // Output
@@ -111,6 +112,7 @@ class SimulationOptions
 
     setSimulationFlags(QStringList());
     setIsValid(false);
+    setDataReconciliationInitialized(false);
     setReSimulate(false);
     setWorkingDirectory("");
     setFileName("");
@@ -176,8 +178,6 @@ class SimulationOptions
   bool getParmodauto() const {return mParmodauto;}
   void setOldInstantiation(bool oldInstantiation) {mOldInstantiation = oldInstantiation;}
   bool getOldInstantiation() const {return mOldInstantiation;}
-  void setDataReconciliation(bool dataReconciliation) {mDataReconciliation = dataReconciliation;}
-  bool getDataReconciliation() const {return mDataReconciliation;}
   void setAdditionalTranslationFlags(QString additionalTranslationFlags) {mAdditionalTranslationFlags = additionalTranslationFlags;}
   QString getAdditionalTranslationFlags() const {return mAdditionalTranslationFlags;}
 
@@ -207,12 +207,16 @@ class SimulationOptions
   bool getEnableAllWarnings() {return mEnableAllWarnings;}
   void setEnableDataReconciliation(bool dataReconciliation) {mEnableDataReconciliation = dataReconciliation;}
   bool getEnableDataReconciliation() {return mEnableDataReconciliation;}
+  void setDataReconciliationAlgorithm(QString dataReconciliationAlgorithm) {mDataReconciliationAlgorithm = dataReconciliationAlgorithm;}
+  QString getDataReconciliationAlgorithm() {return mDataReconciliationAlgorithm;}
   void setDataReconciliationMeasurementInputFile(QString dataReconciliationMeasurementInputFile) {mDataReconciliationMeasurementInputFile = dataReconciliationMeasurementInputFile;}
   QString getDataReconciliationMeasurementInputFile() {return mDataReconciliationMeasurementInputFile;}
   void setDataReconciliationCorrelationMatrixInputFile(QString dataReconciliationCorrelationMatrixInputFile) {mDataReconciliationCorrelationMatrixInputFile = dataReconciliationCorrelationMatrixInputFile;}
   QString getDataReconciliationCorrelationMatrixInputFile() {return mDataReconciliationCorrelationMatrixInputFile;}
   void setDataReconciliationEpsilon(QString dataReconciliationEpsilon) {mDataReconciliationEpsilon = dataReconciliationEpsilon;}
   QString getDataReconciliationEpsilon() {return mDataReconciliationEpsilon;}
+  void setDataReconciliationSaveSetting(bool dataReconciliationSaveSetting) {mDataReconciliationSaveSetting = dataReconciliationSaveSetting;}
+  bool getDataReconciliationSaveSetting() {return mDataReconciliationSaveSetting;}
   void setLogStreams(QStringList logStreams) {mLogStreams = logStreams;}
   QStringList getLogStreams() {return mLogStreams;}
   void setAdditionalSimulationFlags(QString additionalSimulationFlags) {mAdditionalSimulationFlags = additionalSimulationFlags;}
@@ -245,6 +249,8 @@ class SimulationOptions
   QStringList getSimulationFlags() {return mSimulationFlags;}
   void setIsValid(bool isValid) {mValid = isValid;}
   bool isValid() {return mValid;}
+  void setDataReconciliationInitialized(bool dataReconciliationInitialized) {mDataReconciliationInitialized = dataReconciliationInitialized;}
+  bool isDataReconciliationInitialized() {return mDataReconciliationInitialized;}
   void setReSimulate(bool reSimulate) {mReSimulate = reSimulate;}
   bool isReSimulate() {return mReSimulate;}
   void setWorkingDirectory(QString workingDirectory) {mWorkingDirectory = workingDirectory;}
@@ -284,7 +290,6 @@ class SimulationOptions
   bool mNLSanalyticJacobian;
   bool mParmodauto;
   bool mOldInstantiation;
-  bool mDataReconciliation;
   QString mAdditionalTranslationFlags;
   // simulation flags
   QString mModelSetupFile;
@@ -304,6 +309,7 @@ class SimulationOptions
   QString mDataReconciliationMeasurementInputFile;
   QString mDataReconciliationCorrelationMatrixInputFile;
   QString mDataReconciliationEpsilon;
+  bool mDataReconciliationSaveSetting;
   QStringList mLogStreams;
   QString mAdditionalSimulationFlags;
   // output
@@ -320,6 +326,7 @@ class SimulationOptions
 
   QStringList mSimulationFlags;
   bool mValid;
+  bool mDataReconciliationInitialized;
   bool mReSimulate;
   QString mWorkingDirectory;
   QString mFileName;

OMEdit/OMEditLIB/Util/Helper.cpp

@@ -424,6 +424,7 @@ QString Helper::systemSimulationInformation;
 QString Helper::translationFlags;
 QString Helper::send;
 QString Helper::installLibrary;
+QString Helper::dataReconciliation;
 
 void Helper::initHelperVariables()
 {
@@ -725,6 +726,7 @@ void Helper::initHelperVariables()
   Helper::translationFlags = tr("Translation Flags");
   Helper::send = tr("Send");
   Helper::installLibrary = tr("Install Library");
+  Helper::dataReconciliation = tr("Data Reconciliation");
 }
 
 QString GUIMessages::getMessage(int type)

OMEdit/OMEditLIB/Util/Helper.h

@@ -431,6 +431,7 @@ class Helper : public QObject
   static QString translationFlags;
   static QString send;
   static QString installLibrary;
+  static QString dataReconciliation;
 };
 
 class GUIMessages : public QObject