From 8aa8f054d442ea2da291ae8d095be6c40ce1c5a5 Mon Sep 17 00:00:00 2001 From: Romain Janvier Date: Mon, 11 Mar 2024 21:59:21 +0100 Subject: [PATCH 1/4] Remove remaining early breaks in OMP loops (see #5) --- ContextBasedFeature.cpp | 1 - PointFeature.cpp | 1 - q3DMASCClassifier.cpp | 2 -- q3DMASCTools.cpp | 1 - 4 files changed, 5 deletions(-) diff --git a/ContextBasedFeature.cpp b/ContextBasedFeature.cpp index ef9b066..01878ad 100644 --- a/ContextBasedFeature.cpp +++ b/ContextBasedFeature.cpp @@ -257,7 +257,6 @@ bool ContextBasedFeature::prepare( const CorePoints& corePoints, { //process cancelled by the user errorMessage = "Process cancelled"; - break; } } } diff --git a/PointFeature.cpp b/PointFeature.cpp index 5e2d56a..c0c25b0 100644 --- a/PointFeature.cpp +++ b/PointFeature.cpp @@ -478,7 +478,6 @@ static bool ComputeMathOpWithNearestNeighbor( const CorePoints& corePoints, { //process cancelled by the user error = "Process cancelled"; - break; } } } diff --git a/q3DMASCClassifier.cpp b/q3DMASCClassifier.cpp index 0fa1c6f..fdbd6b7 100644 --- a/q3DMASCClassifier.cpp +++ b/q3DMASCClassifier.cpp @@ -224,7 +224,6 @@ bool Classifier::classify( const Feature::Source::Set& featureSources, { errorMessage = cvex.msg.c_str(); success = false; - break; } for (int fIndex = 0; fIndex < attributesPerSample; ++fIndex) @@ -257,7 +256,6 @@ bool Classifier::classify( const Feature::Source::Set& featureSources, { //process cancelled by the user success = false; - break; } } diff --git a/q3DMASCTools.cpp b/q3DMASCTools.cpp index 68eb972..7dac6e1 100644 --- a/q3DMASCTools.cpp +++ b/q3DMASCTools.cpp @@ -1387,7 +1387,6 @@ bool Tools::PrepareFeatures(const CorePoints& corePoints, Feature::Set& features ccLog::Warning("Process cancelled"); errorStr = "Process cancelled"; success = false; - break; } } From 0ad4044bbfe98b3e58348c6eaad02188fd3f4fc3 Mon Sep 17 00:00:00 2001 From: Romain Janvier Date: Mon, 11 Mar 2024 22:13:51 +0100 Subject: [PATCH 2/4] Typo (case) in header name --- q3DMASCDisclaimerDialog.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/q3DMASCDisclaimerDialog.h b/q3DMASCDisclaimerDialog.h index 873fa15..945d5ba 100644 --- a/q3DMASCDisclaimerDialog.h +++ b/q3DMASCDisclaimerDialog.h @@ -25,7 +25,7 @@ #include //Qt -#include +#include //! Dialog for displaying the 3DSMAC/UEB disclaimer class TrainDisclaimerDialog : public QDialog, public Ui::TrainDisclaimerDialog From 9a253ce979d246a18cf53d4d4519b1ca37f1381b Mon Sep 17 00:00:00 2001 From: Romain Janvier Date: Mon, 11 Mar 2024 22:14:10 +0100 Subject: [PATCH 3/4] Missing header on Linux --- q3DMASCClassifier.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/q3DMASCClassifier.cpp b/q3DMASCClassifier.cpp index fdbd6b7..0f2a302 100644 --- a/q3DMASCClassifier.cpp +++ b/q3DMASCClassifier.cpp @@ -46,7 +46,7 @@ #include #endif -#if defined(__APPLE__) +#if defined(CC_MAC_OS) || defined(CC_LINUX) #include #endif From a669be141fe2ba03e884a6c77e3b7088c682e8e6 Mon Sep 17 00:00:00 2001 From: Romain Janvier Date: Mon, 11 Mar 2024 22:19:04 +0100 Subject: [PATCH 4/4] Missing namespace --- qTrain3DMASCDialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qTrain3DMASCDialog.cpp b/qTrain3DMASCDialog.cpp index 3959bf7..1d6fd3e 100644 --- a/qTrain3DMASCDialog.cpp +++ b/qTrain3DMASCDialog.cpp @@ -101,7 +101,7 @@ int Train3DMASCDialog::addFeature(QString name, float importance, bool isChecked nameItem->setCheckState(isChecked ? Qt::Checked : Qt::Unchecked); tableWidget->setItem(index, 0, nameItem); - QTableWidgetItem* importanceItem = new QTableWidgetItem(isnan(importance) ? QString() : QString::number(importance)); + QTableWidgetItem* importanceItem = new QTableWidgetItem(std::isnan(importance) ? QString() : QString::number(importance)); tableWidget->setItem(index, 1, importanceItem); return index; @@ -175,7 +175,7 @@ void Train3DMASCDialog::setFeatureImportance(QString featureName, float importan if (tableWidget->item(index, 0)->text() == featureName) { QTableWidgetItem* item = tableWidget->item(index, FeatureImportanceColumn); - item->setText(isnan(importance) ? QString() : QString::number(importance, 'f', 6)); + item->setText(std::isnan(importance) ? QString() : QString::number(importance, 'f', 6)); return; } }