Skip to content

Commit

Permalink
Remove pedantic option.
Browse files Browse the repository at this point in the history
- Remove the option to toggle the pedantic debug flag, since it's been
  removed from the compiler on account of begin unused.
  • Loading branch information
perost authored and adeas31 committed May 21, 2019
1 parent cef23d1 commit dc9a2b2
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 23 deletions.
6 changes: 0 additions & 6 deletions OMEdit/OMEdit/OMEditGUI/Options/OptionsDialog.cpp
Expand Up @@ -569,10 +569,6 @@ void OptionsDialog::readSimulationSettings()
if (mpSettings->contains("simulation/NLSanalyticJacobian")) {
mpSimulationPage->getTranslationFlagsWidget()->getNLSanalyticJacobianCheckBox()->setChecked(mpSettings->value("simulation/NLSanalyticJacobian").toBool());
}
// save pedantic mode
if (mpSettings->contains("simulation/pedantic")) {
mpSimulationPage->getTranslationFlagsWidget()->getPedanticCheckBox()->setChecked(mpSettings->value("simulation/pedantic").toBool());
}
// save parmodauto
if (mpSettings->contains("simulation/parmodauto")) {
mpSimulationPage->getTranslationFlagsWidget()->getParmodautoCheckBox()->setChecked(mpSettings->value("simulation/parmodauto").toBool());
Expand Down Expand Up @@ -1192,8 +1188,6 @@ void OptionsDialog::saveSimulationSettings()
mpSettings->setValue("simulation/evaluateAllParameters", mpSimulationPage->getTranslationFlagsWidget()->getEvaluateAllParametersCheckBox()->isChecked());
// save NLS analytic jacobian
mpSettings->setValue("simulation/NLSanalyticJacobian", mpSimulationPage->getTranslationFlagsWidget()->getNLSanalyticJacobianCheckBox()->isChecked());
// save pedantic mode
mpSettings->setValue("simulation/pedantic", mpSimulationPage->getTranslationFlagsWidget()->getPedanticCheckBox()->isChecked());
// save parmodauto
mpSettings->setValue("simulation/parmodauto", mpSimulationPage->getTranslationFlagsWidget()->getParmodautoCheckBox()->isChecked());
// save new instantiation
Expand Down
3 changes: 0 additions & 3 deletions OMEdit/OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp
Expand Up @@ -707,7 +707,6 @@ void SimulationDialog::initializeFields(bool isReSimulate, SimulationOptions sim
mpTranslationFlagsWidget->getInitializationCheckBox()->setChecked(pGlobalTranslationFlagsWidget->getInitializationCheckBox()->isChecked());
mpTranslationFlagsWidget->getEvaluateAllParametersCheckBox()->setChecked(pGlobalTranslationFlagsWidget->getEvaluateAllParametersCheckBox()->isChecked());
mpTranslationFlagsWidget->getNLSanalyticJacobianCheckBox()->setChecked(pGlobalTranslationFlagsWidget->getNLSanalyticJacobianCheckBox()->isChecked());
mpTranslationFlagsWidget->getPedanticCheckBox()->setChecked(pGlobalTranslationFlagsWidget->getPedanticCheckBox()->isChecked());
mpTranslationFlagsWidget->getParmodautoCheckBox()->setChecked(pGlobalTranslationFlagsWidget->getParmodautoCheckBox()->isChecked());
mpTranslationFlagsWidget->getNewInstantiationCheckBox()->setChecked(pGlobalTranslationFlagsWidget->getNewInstantiationCheckBox()->isChecked());
mpTranslationFlagsWidget->getDataReconciliationCheckBox()->setChecked(pGlobalTranslationFlagsWidget->getDataReconciliationCheckBox()->isChecked());
Expand Down Expand Up @@ -749,8 +748,6 @@ void SimulationDialog::initializeFields(bool isReSimulate, SimulationOptions sim
mpTranslationFlagsWidget->getEvaluateAllParametersCheckBox()->setChecked(true);
} else if (commandLineOptionValue.compare("NLSanalyticJacobian") == 0) {
mpTranslationFlagsWidget->getNLSanalyticJacobianCheckBox()->setChecked(true);
} else if (commandLineOptionValue.compare("pedantic") == 0) {
mpTranslationFlagsWidget->getPedanticCheckBox()->setChecked(true);
} else if (commandLineOptionValue.compare("parmodauto") == 0) {
mpTranslationFlagsWidget->getParmodautoCheckBox()->setChecked(true);
} else if (commandLineOptionValue.compare("newInst") == 0) {
Expand Down
4 changes: 0 additions & 4 deletions OMEdit/OMEdit/OMEditGUI/Simulation/SimulationOptions.h
Expand Up @@ -75,7 +75,6 @@ class SimulationOptions
setInitialization(true);
setEvaluateAllParameters(false);
setNLSanalyticJacobian(true);
setPedantic(false);
setParmodauto(false);
setNewInstantiation(false);
setDataReconciliation(false);
Expand Down Expand Up @@ -172,8 +171,6 @@ class SimulationOptions
bool getEvaluateAllParameters() const {return mEvaluateAllParameters;}
void setNLSanalyticJacobian(bool nlsAnalyticJacobian) {mNLSanalyticJacobian = nlsAnalyticJacobian;}
bool getNLSanalyticJacobian() const {return mNLSanalyticJacobian;}
void setPedantic(bool pedantic) {mPedantic = pedantic;}
bool getPedantic() const {return mPedantic;}
void setParmodauto(bool parmodauto) {mParmodauto = parmodauto;}
bool getParmodauto() const {return mParmodauto;}
void setNewInstantiation(bool newInstantiation) {mNewInstantiation = newInstantiation;}
Expand Down Expand Up @@ -280,7 +277,6 @@ class SimulationOptions
bool mInitialization;
bool mEvaluateAllParameters;
bool mNLSanalyticJacobian;
bool mPedantic;
bool mParmodauto;
bool mNewInstantiation;
bool mDataReconciliation;
Expand Down
8 changes: 0 additions & 8 deletions OMEdit/OMEdit/OMEditGUI/Simulation/TranslationFlagsWidget.cpp
Expand Up @@ -75,7 +75,6 @@ TranslationFlagsWidget::TranslationFlagsWidget(QWidget *pParent)
mpInitializationCheckBox = new QCheckBox(tr("Show additional information from the initialization process"));
mpEvaluateAllParametersCheckBox = new QCheckBox(tr("Evaluate all parameters (faster simulation, cannot change them at runtime)"));
mpNLSanalyticJacobianCheckBox = new QCheckBox(tr("Enable analytical jacobian for non-linear strong components"));
mpPedanticCheckBox = new QCheckBox(tr("Enable pedantic debug-mode, to get much more feedback"));
mpParmodautoCheckBox = new QCheckBox(tr("Enable parallelization of independent systems of equations (Experimental)"));
mpNewInstantiationCheckBox = new QCheckBox(tr("Enable experimental new instantiation phase"));
mpDataReconciliationCheckBox = new QCheckBox(tr("Enable data reconciliation"));
Expand All @@ -99,7 +98,6 @@ TranslationFlagsWidget::TranslationFlagsWidget(QWidget *pParent)
pMainLayout->addWidget(mpInitializationCheckBox, row++, 0, 1, 3);
pMainLayout->addWidget(mpEvaluateAllParametersCheckBox, row++, 0, 1, 3);
pMainLayout->addWidget(mpNLSanalyticJacobianCheckBox, row++, 0, 1, 3);
pMainLayout->addWidget(mpPedanticCheckBox, row++, 0, 1, 3);
pMainLayout->addWidget(mpParmodautoCheckBox, row++, 0, 1, 3);
pMainLayout->addWidget(mpNewInstantiationCheckBox, row++, 0, 1, 3);
pMainLayout->addWidget(mpDataReconciliationCheckBox, row++, 0, 1, 3);
Expand Down Expand Up @@ -127,7 +125,6 @@ void TranslationFlagsWidget::applySimulationOptions(const SimulationOptions &sim
mpInitializationCheckBox->setChecked(simulationOptions.getInitialization());
mpEvaluateAllParametersCheckBox->setChecked(simulationOptions.getEvaluateAllParameters());
mpNLSanalyticJacobianCheckBox->setChecked(simulationOptions.getNLSanalyticJacobian());
mpPedanticCheckBox->setChecked(simulationOptions.getPedantic());
mpParmodautoCheckBox->setChecked(simulationOptions.getParmodauto());
mpNewInstantiationCheckBox->setChecked(simulationOptions.getNewInstantiation());
mpDataReconciliationCheckBox->setChecked(simulationOptions.getDataReconciliation());
Expand All @@ -146,7 +143,6 @@ void TranslationFlagsWidget::createSimulationOptions(SimulationOptions *pSimulat
pSimulationOptions->setInitialization(mpInitializationCheckBox->isChecked());
pSimulationOptions->setEvaluateAllParameters(mpEvaluateAllParametersCheckBox->isChecked());
pSimulationOptions->setNLSanalyticJacobian(mpNLSanalyticJacobianCheckBox->isChecked());
pSimulationOptions->setPedantic(mpPedanticCheckBox->isChecked());
pSimulationOptions->setParmodauto(mpParmodautoCheckBox->isChecked());
pSimulationOptions->setNewInstantiation(mpNewInstantiationCheckBox->isChecked());
pSimulationOptions->setDataReconciliation(mpDataReconciliationCheckBox->isChecked());
Expand Down Expand Up @@ -192,10 +188,6 @@ QString TranslationFlagsWidget::commandLineOptions()
if (mpNLSanalyticJacobianCheckBox->isChecked()) {
debugFlags.append("NLSanalyticJacobian");
}
// pedantic mode
if (mpPedanticCheckBox->isChecked()) {
debugFlags.append("pedantic");
}
// parmodauto
if (mpParmodautoCheckBox->isChecked()) {
debugFlags.append("parmodauto");
Expand Down
2 changes: 0 additions & 2 deletions OMEdit/OMEdit/OMEditGUI/Simulation/TranslationFlagsWidget.h
Expand Up @@ -52,7 +52,6 @@ class TranslationFlagsWidget : public QWidget
QCheckBox *getInitializationCheckBox() const {return mpInitializationCheckBox;}
QCheckBox *getEvaluateAllParametersCheckBox() const {return mpEvaluateAllParametersCheckBox;}
QCheckBox *getNLSanalyticJacobianCheckBox() const {return mpNLSanalyticJacobianCheckBox;}
QCheckBox *getPedanticCheckBox() const {return mpPedanticCheckBox;}
QCheckBox *getParmodautoCheckBox() const {return mpParmodautoCheckBox;}
QCheckBox *getNewInstantiationCheckBox() const {return mpNewInstantiationCheckBox;}
QCheckBox *getDataReconciliationCheckBox() const {return mpDataReconciliationCheckBox;}
Expand All @@ -70,7 +69,6 @@ class TranslationFlagsWidget : public QWidget
QCheckBox *mpInitializationCheckBox;
QCheckBox *mpEvaluateAllParametersCheckBox;
QCheckBox *mpNLSanalyticJacobianCheckBox;
QCheckBox *mpPedanticCheckBox;
QCheckBox *mpParmodautoCheckBox;
QCheckBox *mpNewInstantiationCheckBox;
QCheckBox *mpDataReconciliationCheckBox;
Expand Down

0 comments on commit dc9a2b2

Please sign in to comment.