1. update Input_Item::default_1()

Author: PeizeLin

source/Makefile.Objects

@@ -248,7 +248,6 @@ read_dm.o\
 read_txt_tools.o\
 read_txt_stru.o\
 read_txt_input_value.o\
-read_txt_input_item.o\
 read_txt_input_list.o\
 read_txt_input_process.o\
 read_txt_input-general.o\

source/src_io/read_txt_input-general.cpp

@@ -13,34 +13,34 @@ namespace Read_Txt_Input
 	{
 		{
 			Input_Item item("nspin");
-			item.default1({"1"});
+			item.default_1(1);
 			item.annotation = "1: single spin; 2: up and down spin; 4: noncollinear spin";
 			item.check_transform = [](Input_Item &self)
 			{
 				Input_List::check_value_size(self, 1);
-				if(!Read_Txt_Tools::in_set(self.value[0].gets(), {"1","2","4"}))
+				if(!Read_Txt_Tools::in_set(self.values[0].gets(), {"1","2","4"}))
 					throw std::invalid_argument("nspin must be 1,2,4");
 			};
 			item.convert = [](const Input_Item &self)
 			{
-				GlobalV::NSPIN = self.value[0].geti();
+				GlobalV::NSPIN = self.values[0].geti();
 			};
 			this->add_item(item);
 		}
 
 		{
 			Input_Item item("ntype");
-			item.default1({"0"});
+			item.default_1(0);
 			item.annotation = "atom species number";
 			item.check_transform = [](Input_Item &self)
 			{
 				Input_List::check_value_size(self, 1);
-				if(self.value[0].geti()<=0)
+				if(self.values[0].geti()<=0)
 					throw std::invalid_argument("ntype must > 0");
 			};
 			item.convert = [](const Input_Item &self)
 			{
-				GlobalC::ucell.ntype = self.value[0].geti();
+				GlobalC::ucell.ntype = self.values[0].geti();
 			};
 			this->add_item(item);
 		}

source/src_io/read_txt_input-pw.cpp

@@ -12,18 +12,18 @@ namespace Read_Txt_Input
 	{
 		{
 			Input_Item item("ecutwfc");
-			item.default1({"100","eV"});
+			item.default_1(100,"eV");
 			item.annotation = "energy cutoff for wave functions";
 			item.check_transform = [](Input_Item &self)
 			{
 				Input_List::check_value_size(self, 1, 2);
-				if(self.value[1].gets()=="eV"){}
-				else if(self.value[1].gets()=="Ry")
-					self.value[0].setd( self.value[0].getd() / ModuleBase::Ry_to_eV );
+				if(self.values[1].gets()=="eV"){}
+				else if(self.values[1].gets()=="Ry")
+					self.values[0].setd( self.values[0].getd() / ModuleBase::Ry_to_eV );
 				else
-					throw std::invalid_argument(self.value[1].gets());
-				self.value[1].sets("eV");
-				if(self.value[0].getd()<=0)
+					throw std::invalid_argument(self.values[1].gets());
+				self.values[1].sets("eV");
+				if(self.values[0].getd()<=0)
 					throw std::invalid_argument("ecutwfc must > 0");
 			};
 			item.convert = [](const Input_Item &self)

source/src_io/read_txt_input_item-template.h

@@ -0,0 +1,57 @@
+#ifndef READ_TXT_INPUT_ITEM_TEMPLATE_H
+#define READ_TXT_INPUT_ITEM_TEMPLATE_H
+
+#include "read_txt_input_item.h"
+
+namespace Read_Txt_Input
+{
+	template<typename T>
+	void Input_Item::default_1(const T &value)
+	{
+		set_value(value);
+	}
+
+	template <typename T_head, typename... T_tail>
+	void Input_Item::default_1( const T_head &value_head, const T_tail... values_tail)
+	{
+		set_value(value_head);
+		default_1(values_tail...);
+	}
+
+	template<>
+	void Input_Item::set_value(const bool &b)
+	{
+		this->values.push_back({});
+		this->values.back().setb(b);
+	}
+
+	template<>
+	void Input_Item::set_value(const int &i)
+	{
+		this->values.push_back({});
+		this->values.back().seti(i);
+	}
+
+	template<>
+	void Input_Item::set_value(const double &d)
+	{
+		this->values.push_back({});
+		this->values.back().setd(d);
+	}
+
+	template<>
+	void Input_Item::set_value(const std::string &s)
+	{
+		this->values.push_back({});
+		this->values.back().sets(s);
+	}
+
+	template<>
+	void Input_Item::set_value(const char*const &s)
+	{
+		this->values.push_back({});
+		this->values.back().sets(std::string(s));
+	}
+}
+
+#endif

source/src_io/read_txt_input_item.cpp

@@ -19,7 +19,10 @@ namespace Read_Txt_Input
 	public:
 		// call these functions
 		Input_Item(const std::string &label_in) :label(label_in) {}
-		void default1(const std::vector<std::string> &value_in);
+		template<typename T>
+		void default_1(const T &value);
+		template <typename T_head, typename... T_tail>
+		void default_1( const T_head &value_head, const T_tail... values_tail);
 
 		// set these variables and functions
 		std::string annotation;
@@ -30,14 +33,18 @@ namespace Read_Txt_Input
 		std::function<void(const Input_Item&)> convert
 			= [](const Input_Item&item){};
 
-		std::vector<Input_Value> value;
+		std::vector<Input_Value> values;
 
 	private:
 		std::string label;
 		int value_read_size = -1;
+
 		friend class Input_List;
 		friend class Input_Process;
 
+		template<typename T>
+		void set_value(const T &value);
+
 #ifdef USE_CEREAL_SERIALIZATION
 	public:
 		Input_Item() = default;	
@@ -48,4 +55,6 @@ namespace Read_Txt_Input
 	};	
 }
 
+#include "read_txt_input_item-template.h"
+
 #endif

source/src_io/read_txt_input_item.h

@@ -35,10 +35,10 @@ namespace Read_Txt_Input
 			const auto ptr = input.list.find(input_read.first);
 			if(ptr==input.list.end())
 				throw std::out_of_range("input_read.first");
-			if(input_read.second.size() > ptr->second.value.size())
+			if(input_read.second.size() > ptr->second.values.size())
 				throw std::out_of_range("size error");
 			for(size_t i=0; i<input_read.second.size(); ++i)
-				ptr->second.value[i].sets(input_read.second[i]);
+				ptr->second.values[i].sets(input_read.second[i]);
 			ptr->second.value_read_size = input_read.second.size();
 		}
 	}
@@ -61,7 +61,7 @@ namespace Read_Txt_Input
 		for(const std::string &label : input.add_order)
 		{
 			ofs<<label<<"\t";
-			for(const Input_Value &value : input.list.at(label).value)
+			for(const Input_Value &value : input.list.at(label).values)
 				ofs<<value.gets()<<" ";
 			ofs<<"\t# "<<input.list.at(label).annotation<<std::endl;
 		}

source/src_io/read_txt_input_process.cpp

@@ -50,7 +50,7 @@ template<class Archive> void Input_Value::serialize( Archive & ar )
 template<class Archive> void Input_Item::serialize( Archive & ar )
 {
 	ar( this->annotation );
-	ar( this->value );
+	ar( this->values );
 	ar( this->label );
 	ar( this->value_read_size );
 }