From 8505dd2e0ceefc0b430241568fdacde418d0f435 Mon Sep 17 00:00:00 2001
From: Matthias Puchner <github@mpuchner.de>
Date: Wed, 24 Nov 2021 15:53:34 +0100
Subject: [PATCH] NumberOfMonteCarloPoints has to be unsigned
---
GUI/Model/From/GUIObjectBuilder.cpp | 3 ++-
GUI/Model/Session/SimulationOptionsItem.cpp | 9 ++-------
GUI/Model/Session/SimulationOptionsItem.h | 5 ++---
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/GUI/Model/From/GUIObjectBuilder.cpp b/GUI/Model/From/GUIObjectBuilder.cpp
index 9ae4e7c6a90..499ba1ffe60 100644
--- a/GUI/Model/From/GUIObjectBuilder.cpp
+++ b/GUI/Model/From/GUIObjectBuilder.cpp
@@ -96,7 +96,8 @@ void GUI::Model::ObjectBuilder::populateSimulationOptions(SimulationOptionsItem*
const ISimulation& simulation)
{
if (simulation.options().isIntegrate())
- item->setUseMonteCarloIntegration(static_cast<int>(simulation.options().getMcPoints()));
+ item->setUseMonteCarloIntegration(
+ static_cast<unsigned>(simulation.options().getMcPoints()));
else
item->setUseAnalytical();
diff --git a/GUI/Model/Session/SimulationOptionsItem.cpp b/GUI/Model/Session/SimulationOptionsItem.cpp
index 59b3569c0cc..516f863be28 100644
--- a/GUI/Model/Session/SimulationOptionsItem.cpp
+++ b/GUI/Model/Session/SimulationOptionsItem.cpp
@@ -66,7 +66,7 @@ void SimulationOptionsItem::setRunImmediately(bool runImmediately)
m_runImmediately = runImmediately;
}
-void SimulationOptionsItem::setUseMonteCarloIntegration(int numberOfPoints)
+void SimulationOptionsItem::setUseMonteCarloIntegration(unsigned numberOfPoints)
{
m_computationMethodAnalytical = false;
m_numberOfMonteCarloPoints = numberOfPoints;
@@ -87,16 +87,11 @@ bool SimulationOptionsItem::useAnalytical() const
return m_computationMethodAnalytical;
}
-int SimulationOptionsItem::numberOfMonteCarloPoints() const
+unsigned SimulationOptionsItem::numberOfMonteCarloPoints() const
{
return m_numberOfMonteCarloPoints;
}
-void SimulationOptionsItem::setNumberOfMonteCarloPoints(int npoints)
-{
- m_numberOfMonteCarloPoints = npoints;
-}
-
void SimulationOptionsItem::setUseAverageMaterials(bool useAverageMaterials)
{
m_useAverageMaterials = useAverageMaterials;
diff --git a/GUI/Model/Session/SimulationOptionsItem.h b/GUI/Model/Session/SimulationOptionsItem.h
index 6e79b150eba..50b27147e85 100644
--- a/GUI/Model/Session/SimulationOptionsItem.h
+++ b/GUI/Model/Session/SimulationOptionsItem.h
@@ -33,13 +33,12 @@ public:
bool runImmediately() const;
bool runInBackground() const;
- void setUseMonteCarloIntegration(int numberOfPoints);
+ void setUseMonteCarloIntegration(unsigned numberOfPoints);
void setUseAnalytical();
bool useMonteCarloIntegration() const;
bool useAnalytical() const;
- void setNumberOfMonteCarloPoints(int npoints);
- int numberOfMonteCarloPoints() const;
+ unsigned numberOfMonteCarloPoints() const;
void setUseAverageMaterials(bool useAverageMaterials);
bool useAverageMaterials() const;
--
GitLab