@@ -14,24 +14,26 @@ void ReadInput::item_relax()
1414 item.annotation = " cg; bfgs; sd; cg; cg_bfgs;" ;
1515 read_sync_string (input.relax_method );
1616 item.read_value = [](const Input_Item& item, Parameter& para) {
17- para.input .relax_method_param .method =item.str_values [0 ];
18- para.input .relax_method = para.input .relax_method_param .method ;
1917 if (item.get_size ()==1 )
2018 {
19+ para.input .relax_method_param .method =item.str_values [0 ];
20+ para.input .relax_method = para.input .relax_method_param .method ;
2121 para.input .relax_method_param .param = " 1" ;
2222 }
23- else
23+ else if (item. get_size ()== 2 )
2424 {
25+ para.input .relax_method_param .method =item.str_values [0 ];
26+ para.input .relax_method = para.input .relax_method_param .method ;
2527 para.input .relax_method_param .param = item.str_values [1 ];
2628 }
29+ };
2730
2831 // std::istringstream iss(item.str_values[0]);
2932 // iss >> para.input.relax_method_param.method;
3033 // if (!(iss >> para.input.relax_method_param.param)) {
3134 // std::cout << "No parameter provided for relax_method_param.param, default to 1" << std::endl;
3235 // para.input.relax_method_param.param = "1";
3336 // }
34- };
3537 item.check_value = [](const Input_Item& item, const Parameter& para) {
3638 const std::vector<std::string> relax_methods = {" cg" , " sd" , " cg_bfgs" ," bfgs" ," lbfgs" };
3739 if (std::find (relax_methods.begin (), relax_methods.end (), para.input .relax_method_param .method ) == relax_methods.end ()) {
0 commit comments