fix typos and improve Parameters.exists

MathCancer · Jun 20, 2024 · a3e9898 · a3e9898
1 parent cd4a81e
commit a3e9898
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/modules/PhysiCell_settings.cpp b/modules/PhysiCell_settings.cpp
@@ -465,11 +465,7 @@ void Parameters<T>::add_parameter( std::string my_name , T my_value )
 template <class T>
 void Parameters<T>::add_parameter( std::string my_name , T my_value , std::string my_units )
 {
-	if (exists(my_name))
-	{
-		std::cout << "ERROR: Parameter " << my_name << " already exists. Make sure all parameters (of a given type) have unique names." << std::endl;
-		exit(-1);
-	}
+	assert_exists(my_name);
 
 	Parameter<T>* pNew; 
 	pNew = new Parameter<T> ;
@@ -488,8 +484,7 @@ void Parameters<T>::add_parameter( std::string my_name , T my_value , std::strin
 template <class T>
 void Parameters<T>::add_parameter( Parameter<T> param )
 {
-	if (exists(param.name))
-	{ exit(-1);}
+	assert_exists(param.name);
 
 	int n = parameters.size(); 
 	parameters.push_back( param); 
@@ -498,12 +493,14 @@ void Parameters<T>::add_parameter( Parameter<T> param )
 }
 
 template <class T>
-bool Parameters<T>::exists( std::string search_name )
+void Parameters<T>::assert_exists( std::string search_name )
 {
 	if( find_index( search_name ) == -1 )
-	{ return false; }
-	std::cout << "ERROR: Parameter " << search_name << " already exists. Make sure all parameters (of a given type) have unique names." << std::endl;
-	return true;
+	{
+		std::cout << "ERROR: Parameter " << search_name << " already exists. Make sure all parameters (of a given type) have unique names." << std::endl;
+		exit(-1);
+	}
+	return;
 }
 
 std::ostream& operator<<( std::ostream& os , const User_Parameters up )

diff --git a/modules/PhysiCell_settings.h b/modules/PhysiCell_settings.h
@@ -200,10 +200,9 @@ class Parameters
 	Parameter<T>& operator[]( int i );
 	Parameter<T>& operator[]( std::string str ); 
 
-	int size( void ) const; 
-
-	bool exists( std::string search_name );
+	int size( void ) const;
 
+	void assert_exists(std::string search_name);
 };
 
 class User_Parameters