Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
zsarnoczay committed Oct 1, 2022
2 parents c398ca9 + f3772fe commit 8d711e7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Examples/pbdl-0001/src/input.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
"secondMode": 0,
"solver": "Umfpack"
},
"UQ_Method": {
"UQ": {
"parallelExecution": true,
"samplingMethodData": {
"method": "LHS",
Expand Down
2 changes: 1 addition & 1 deletion Examples/pbdl-0002/src/input.json
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
"secondMode": 0,
"solver": "Umfpack"
},
"UQ_Method": {
"UQ": {
"parallelExecution": true,
"samplingMethodData": {
"method": "LHS",
Expand Down
6 changes: 4 additions & 2 deletions LossModel/LossModelSelection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#include <QScrollArea>

#include "LossModelSelection.h"
#include <GoogleAnalytics.h>

LossModelSelection::LossModelSelection(

Expand Down Expand Up @@ -205,7 +206,7 @@ void LossModelSelection::dlSelectionChanged(const QString &arg1)
theStackedWidget->setCurrentIndex(0);
theCurrentMethod = thePelicunWidget;

}else {
} else {
errorMessage("ERROR: Loss Input - no valid Method provided .. keeping old");
qDebug() << "ERROR: Loss Input - no valid Method provided .. keeping old" << arg1;
}
Expand All @@ -219,7 +220,8 @@ LossModelSelection::copyFiles(QString &destDir) {
bool result = true;

if (theCurrentMethod != 0) {
return theCurrentMethod->copyFiles(destDir);
GoogleAnalytics::ReportAppUsage("DL-Pelicun");
return theCurrentMethod->copyFiles(destDir);
}

return result;
Expand Down

0 comments on commit 8d711e7

Please sign in to comment.