1. Add Input_Item::values_type. Update Input_Process::check_transform() and Input_Process::out()

Author: PeizeLin

source/src_io/read_txt_input-general.cpp

@@ -52,11 +52,6 @@ namespace Read_Txt_Input
 			Input_Item item("symmetry");
 			item.default_1(false);
 			item.annotation = "turn symmetry on or off";
-			item.check_transform = [](Input_Item &self)
-			{
-				if(!Read_Txt_Tools::in_set( self.values[0].gets(), Read_Txt_Tools::Preset::Bool))
-					throw std::invalid_argument("symmetry must be bool");
-			};
 			item.convert = [](const Input_Item &self)
 			{
 				ModuleSymmetry::Symmetry::symm_flag = self.values[0].getb();

source/src_io/read_txt_input-pw.cpp

@@ -17,7 +17,7 @@ namespace Read_Txt_Input
 	{
 		{
 			Input_Item item("ecutwfc");
-			item.default_1(100,"eV");
+			item.default_1(100.0,"eV");
 			item.annotation = "energy cutoff for wave functions";
 			item.check_transform = [](Input_Item &self)
 			{

source/src_io/read_txt_input_item-template.h

@@ -28,34 +28,39 @@ namespace Read_Txt_Input
 	{
 		this->values.push_back({});
 		this->values.back().setb(b);
+		this->values_type.push_back("b");
 	}
 
 	template<>
 	void Input_Item::set_value(const int &i)
 	{
 		this->values.push_back({});
 		this->values.back().seti(i);
+		this->values_type.push_back("i");
 	}
 
 	template<>
 	void Input_Item::set_value(const double &d)
 	{
 		this->values.push_back({});
 		this->values.back().setd(d);
+		this->values_type.push_back("d");
 	}
 
 	template<>
 	void Input_Item::set_value(const std::string &s)
 	{
 		this->values.push_back({});
 		this->values.back().sets(s);
+		this->values_type.push_back("s");
 	}
 
 	template<>
 	void Input_Item::set_value(const char*const &s)
 	{
 		this->values.push_back({});
 		this->values.back().sets(std::string(s));
+		this->values_type.push_back("s");
 	}
 }
 

source/src_io/read_txt_input_item.h

@@ -43,6 +43,7 @@ namespace Read_Txt_Input
 	private:
 		std::string label;
 		//int value_read_size = -1;
+		std::vector<std::string> values_type;
 
 		friend class Input_List;
 		friend class Input_Process;

source/src_io/read_txt_input_process.cpp

@@ -56,7 +56,18 @@ namespace Read_Txt_Input
 	void Input_Process::check_transform()
 	{
 		for(auto &item : input.list)
+		{
 			item.second.check_transform(item.second);
+
+			for(size_t i=0; i<item.second.values.size(); ++i)
+			{
+				if(item.second.values_type[i]=="b")
+				{
+					if(!Read_Txt_Tools::in_set( item.second.values[i].gets(), Read_Txt_Tools::Preset::Bool))
+						throw std::invalid_argument("INPUT "+item.second.label+" must be bool");
+				}
+			}
+		}
 	}
 
 	void Input_Process::default2()
@@ -71,9 +82,26 @@ namespace Read_Txt_Input
 		for(const std::string &label : input.add_order)
 		{
 			ofs<<label<<"\t";
-			for(const Input_Value &value : input.list.at(label).values)
-				ofs<<value.gets()<<" ";
-			ofs<<"\t# "<<input.list.at(label).annotation<<std::endl;
+			const Read_Txt_Input::Input_Item &item = input.list.at(label);
+			for(size_t i=0; i<item.values.size(); ++i)
+			{
+				if(item.values_type[i]=="s")
+					ofs<<item.values[i].gets()<<" ";
+				else if(item.values_type[i]=="d")
+					ofs<<std::to_string(item.values[i].getd())<<" ";
+				else if(item.values_type[i]=="i")
+					ofs<<std::to_string(item.values[i].geti())<<" ";
+				else if(item.values_type[i]=="b")
+				{
+					if(item.values[i].getb())
+						ofs<<"true"<<" ";
+					else
+						ofs<<"false"<<" ";
+				}
+				else
+					throw invalid_argument("Input_Process::out() value_type["+std::to_string(i)+"]="+item.values_type[i]);
+			}
+			ofs<<"\t# "<<item.annotation<<std::endl;
 		}
 	}