Changeset 2b48418d in OpenModelica

Timestamp:

2019-01-18T16:35:28+01:00 (5 years ago)

Author:

Adeel Asghar <adeel.asghar@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

18e18bd

Parents:

0bae201

Message:

Adapt to oms_setTolerance

Location:

OMEdit/OMEditGUI

Files:

• Modeling/Commands.cpp (modified) (2 diffs)
• OMS/OMSProxy.cpp (modified) (1 diff)
• OMS/OMSProxy.h (modified) (1 diff)
• OMS/SystemSimulationInformationDialog.cpp (modified) (6 diffs)
• OMS/SystemSimulationInformationDialog.h (modified) (3 diffs)

OMEdit/OMEditGUI/Modeling/Commands.cpp

@@ -2876 +2876 @@
       return;
     }
-    if (!OMSProxy::instance()->setTolerance(mpLibraryTreeItem->getNameStructure(), mpWCSystemSimulationInformation->mTolerance)) {
+    if (!OMSProxy::instance()->setTolerance(mpLibraryTreeItem->getNameStructure(), mpWCSystemSimulationInformation->mAbsoluteTolerance,
+                                            mpWCSystemSimulationInformation->mRelativeTolerance)) {
       setFailed(true);
       return;
@@ -2885 +2886 @@
       return;
     }
-    if (!OMSProxy::instance()->setTolerance(mpLibraryTreeItem->getNameStructure(), mpSCSystemSimulationInformation->mTolerance)) {
+    if (!OMSProxy::instance()->setTolerance(mpLibraryTreeItem->getNameStructure(), mpSCSystemSimulationInformation->mAbsoluteTolerance,
+                                            mpSCSystemSimulationInformation->mRelativeTolerance)) {
       setFailed(true);
       return;

OMEdit/OMEditGUI/OMS/OMSProxy.cpp

@@ -1368 +1368 @@
  * \return
  */
-bool OMSProxy::setTolerance(QString cref, double tolerance)
+bool OMSProxy::setTolerance(QString cref, double absoluteTolerance, double relativeTolerance)
 {
   QString command = "oms_setTolerance";
   QStringList args;
-  args << "\"" + cref + "\"" << QString::number(tolerance);
-  LOG_COMMAND(command, args);
-  oms_status_enu_t status = oms_setTolerance(cref.toStdString().c_str(), tolerance, tolerance);
+  args << "\"" + cref + "\"" << QString::number(absoluteTolerance) << QString::number(relativeTolerance);
+  LOG_COMMAND(command, args);
+  oms_status_enu_t status = oms_setTolerance(cref.toStdString().c_str(), absoluteTolerance, relativeTolerance);
   logResponse(command, status, &commandTime);
   return statusToBool(status);

OMEdit/OMEditGUI/OMS/OMSProxy.h

@@ -131 +131 @@
   bool setTLMConnectionParameters(QString crefA, QString crefB, const oms_tlm_connection_parameters_t *pParameters);
   bool setTLMSocketData(QString cref, QString address, int managerPort, int monitorPort);
-  bool setTolerance(QString cref, double tolerance);
+  bool setTolerance(QString cref, double absoluteTolerance, double relativeTolerance);
   void setWorkingDirectory(QString path);
   bool simulate_asynchronous(QString cref);

OMEdit/OMEditGUI/OMS/SystemSimulationInformationDialog.cpp

@@ -49 +49 @@
 {
   mFixedStepSize = 0.0;
-  mTolerance = 0.0;
+  mAbsoluteTolerance = 0.0;
+  mRelativeTolerance = 0.0;
 }
 
@@ -55 +56 @@
 {
   mFixedStepSize = 0.0;
-  mTolerance = 0.0;
+  mAbsoluteTolerance = 0.0;
+  mRelativeTolerance = 0.0;
 
   mDescription = "";
@@ -106 +108 @@
     mpFixedStepSizeTextBox = new QLineEdit;
     mpFixedStepSizeTextBox->setValidator(pDoubleValidator);
-    // tolerance
-    mpToleranceLabel = new Label("Tolerance:");
-    mpToleranceTextBox = new QLineEdit;
-    mpToleranceTextBox->setValidator(pDoubleValidator);
+    // absolute tolerance
+    mpAbsoluteToleranceLabel = new Label("Absolute Tolerance:");
+    mpAbsoluteToleranceTextBox = new QLineEdit;
+    mpAbsoluteToleranceTextBox->setValidator(pDoubleValidator);
+    // relative tolerance
+    mpRelativeToleranceLabel = new Label("Relative Tolerance:");
+    mpRelativeToleranceTextBox = new QLineEdit;
+    mpRelativeToleranceTextBox->setValidator(pDoubleValidator);
   } else { // oms_system_sc
     // fixed step size
@@ -115 +121 @@
     mpFixedStepSizeTextBox = new QLineEdit;
     mpFixedStepSizeTextBox->setValidator(pDoubleValidator);
-    // tolerance
-    mpToleranceLabel = new Label("Tolerance:");
-    mpToleranceTextBox = new QLineEdit;
-    mpToleranceTextBox->setValidator(pDoubleValidator);
+    // absolute tolerance
+    mpAbsoluteToleranceLabel = new Label("Absolute Tolerance:");
+    mpAbsoluteToleranceTextBox = new QLineEdit;
+    mpAbsoluteToleranceTextBox->setValidator(pDoubleValidator);
+    // relative tolerance
+    mpRelativeToleranceLabel = new Label("Relative Tolerance:");
+    mpRelativeToleranceTextBox = new QLineEdit;
+    mpRelativeToleranceTextBox->setValidator(pDoubleValidator);
   }
   // buttons
@@ -147 +157 @@
     pMainLayout->addWidget(mpFixedStepSizeLabel, row, 0);
     pMainLayout->addWidget(mpFixedStepSizeTextBox, row++, 1);
-    pMainLayout->addWidget(mpToleranceLabel, row, 0);
-    pMainLayout->addWidget(mpToleranceTextBox, row++, 1);
+    pMainLayout->addWidget(mpAbsoluteToleranceLabel, row, 0);
+    pMainLayout->addWidget(mpAbsoluteToleranceTextBox, row++, 1);
+    pMainLayout->addWidget(mpRelativeToleranceLabel, row, 0);
+    pMainLayout->addWidget(mpRelativeToleranceTextBox, row++, 1);
   } else { // oms_system_sc
     pMainLayout->addWidget(mpFixedStepSizeLabel, row, 0);
     pMainLayout->addWidget(mpFixedStepSizeTextBox, row++, 1);
-    pMainLayout->addWidget(mpToleranceLabel, row, 0);
-    pMainLayout->addWidget(mpToleranceTextBox, row++, 1);
+    pMainLayout->addWidget(mpAbsoluteToleranceLabel, row, 0);
+    pMainLayout->addWidget(mpAbsoluteToleranceTextBox, row++, 1);
+    pMainLayout->addWidget(mpRelativeToleranceLabel, row, 0);
+    pMainLayout->addWidget(mpRelativeToleranceTextBox, row++, 1);
   }
   pMainLayout->addWidget(mpButtonBox, row++, 0, 1, 2, Qt::AlignRight);
@@ -205 +219 @@
   } else if (mpGraphicsView->getModelWidget()->getLibraryTreeItem()->isWCSystem()) {
     wcSystemSimulationInformation.mFixedStepSize = mpFixedStepSizeTextBox->text().toDouble();
-    wcSystemSimulationInformation.mTolerance = mpToleranceTextBox->text().toDouble();
+    wcSystemSimulationInformation.mAbsoluteTolerance = mpAbsoluteToleranceTextBox->text().toDouble();
+    wcSystemSimulationInformation.mRelativeTolerance = mpRelativeToleranceTextBox->text().toDouble();
   } else { // oms_system_sc
     scSystemSimulationInformation.mFixedStepSize = mpFixedStepSizeTextBox->text().toDouble();
-    scSystemSimulationInformation.mTolerance = mpToleranceTextBox->text().toDouble();
+    wcSystemSimulationInformation.mAbsoluteTolerance = mpAbsoluteToleranceTextBox->text().toDouble();
+    wcSystemSimulationInformation.mRelativeTolerance = mpRelativeToleranceTextBox->text().toDouble();
   }
   // system simulation information command

OMEdit/OMEditGUI/OMS/SystemSimulationInformationDialog.h

@@ -58 +58 @@
 
   double mFixedStepSize;
-  double mTolerance;
+  double mAbsoluteTolerance;
+  double mRelativeTolerance;
 };
 
@@ -67 +68 @@
 
   double mFixedStepSize;
-  double mTolerance;
 
   QString mDescription;
@@ -96 +96 @@
   Label *mpFixedStepSizeLabel;
   QLineEdit *mpFixedStepSizeTextBox;
-  Label *mpToleranceLabel;
-  QLineEdit *mpToleranceTextBox;
+  Label *mpAbsoluteToleranceLabel;
+  QLineEdit *mpAbsoluteToleranceTextBox;
+  Label *mpRelativeToleranceLabel;
+  QLineEdit *mpRelativeToleranceTextBox;
   QPushButton *mpOkButton;
   QPushButton *mpCancelButton;