From 2185461446dfb527bf5a3860c0105813bd023b93 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 24 Feb 2024 06:40:27 -0500 Subject: [PATCH] Convert getter member function of populationPool to const versions --- libOPHD/Population/PopulationPool.cpp | 14 +++++++------- libOPHD/Population/PopulationPool.h | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libOPHD/Population/PopulationPool.cpp b/libOPHD/Population/PopulationPool.cpp index b51fe425a..cc91e0557 100644 --- a/libOPHD/Population/PopulationPool.cpp +++ b/libOPHD/Population/PopulationPool.cpp @@ -9,7 +9,7 @@ /** * Sets a pointer to a Population object. - * + * * \note PopulationPool expects a valid object and does no checking * for invalid states. */ @@ -19,13 +19,13 @@ void PopulationPool::population(Population* pop) } -int PopulationPool::availableWorkers() +int PopulationPool::availableWorkers() const { return mPopulation->getPopulations().worker - workersEmployed(); } -int PopulationPool::availableScientists() +int PopulationPool::availableScientists() const { return mPopulation->getPopulations().scientist - scientistsEmployed(); } @@ -67,7 +67,7 @@ void PopulationPool::clear() /** * Amount of Scientists employed as Workers. */ -int PopulationPool::scientistsAsWorkers() +int PopulationPool::scientistsAsWorkers() const { return mScientistsAsWorkers; } @@ -76,7 +76,7 @@ int PopulationPool::scientistsAsWorkers() /** * Amount of Scientists currently employed. */ -int PopulationPool::scientistsEmployed() +int PopulationPool::scientistsEmployed() const { return mScientistsUsed; } @@ -85,7 +85,7 @@ int PopulationPool::scientistsEmployed() /** * Amount of Workers currently employed. */ -int PopulationPool::workersEmployed() +int PopulationPool::workersEmployed() const { return mWorkersUsed; } @@ -94,7 +94,7 @@ int PopulationPool::workersEmployed() /** * Amount of population currently employed. */ -int PopulationPool::populationEmployed() +int PopulationPool::populationEmployed() const { return scientistsEmployed() + scientistsAsWorkers() + workersEmployed(); } diff --git a/libOPHD/Population/PopulationPool.h b/libOPHD/Population/PopulationPool.h index ed2ec80a0..33f7b09aa 100644 --- a/libOPHD/Population/PopulationPool.h +++ b/libOPHD/Population/PopulationPool.h @@ -15,17 +15,17 @@ class PopulationPool public: void population(Population* pop); - int availableWorkers(); - int availableScientists(); + int availableWorkers() const; + int availableScientists() const; bool usePopulation(PopulationRequirements populationRequirements); void clear(); - int scientistsAsWorkers(); - int scientistsEmployed(); - int workersEmployed(); - int populationEmployed(); + int scientistsAsWorkers() const; + int scientistsEmployed() const; + int workersEmployed() const; + int populationEmployed() const; int size() const;