more work to handle fixed pars with a nondefault scale and/or offset

Author: jtwhite79

benchmarks/mou_tests_2.py

@@ -2156,7 +2156,27 @@ def zdt1_fixed_scaleoffset_test():
 
     print(df.loc[others,:])
     assert np.all(df.loc[others,"val"].values <= 0)
+    dv0 = pd.read_csv(os.path.join(t_d,"zdt1.0.dv_pop.csv"),index_col=0)
+    assert dv0.shape == pe.shape
+    diff = np.abs(dv0.values - pe._df.loc[dv0.index,dv0.columns].values)
+    print(diff)
+    print(diff.sum())
+    assert diff.max() < 1e-10
+    pst.control_data.noptmax = 1
+    pst.write(os.path.join(t_d,"zdt1.pst"))
 
+    pyemu.os_utils.run("{0} {1}".format(exe_path,"zdt1.pst"),cwd=t_d)
+    dv1 = pd.read_csv(os.path.join(t_d,"zdt1.1.dv_pop.csv"),index_col=0)
+    for other in others:
+        #print(dv1.loc[:,other])
+        assert np.all(dv1.loc[:,other].values > 0)
+        #make sure that the values in the fixed columns are also in the initial pe
+        min_diff = 1e10
+        for val in dv1.loc[:,other].values:
+            min_diff = min(min_diff,np.abs((pe.loc[:,others] - val).values).min())
+            print(min_diff)
+            assert min_diff < 1e-10
+
 
 def zdt1_fixedtied_stack_test():
     t_d = mou_suite_helper.setup_problem("zdt1",True,True)
@@ -2695,7 +2715,7 @@ def mou_bound_handling_test():
 
 
 if __name__ == "__main__":
-    mou_bound_handling_test()
+    #mou_bound_handling_test()
     #basic_pso_test()
     #test_restart_all()
     #chance_consistency_test()
@@ -2709,7 +2729,7 @@ def mou_bound_handling_test():
     #plot_hosaki(m_d=os.path.join("mou_tests","hosaki_empcov_master_risk"))
     #basic_pso_test()
     #zdt1_fixedtied_stack_test()
-    #zdt1_fixed_scaleoffset_test()
+    zdt1_fixed_scaleoffset_test()
     #shutil.copy2(os.path.join("..","exe","windows","x64","Debug","pestpp-mou.exe"),os.path.join("..","bin","pestpp-mou.exe"))
     #invest()
     #plot()
@@ -2777,4 +2797,4 @@ def mou_bound_handling_test():
 
     #pop_sched_test()
     #simplex_invest_1()
-    pi_output_test()
+    #pi_output_test()

src/libs/pestpp_common/Ensemble.cpp

@@ -2229,7 +2229,7 @@ map<int,int> ParameterEnsemble::add_runs(RunManagerAbstract *run_mgr_ptr,const v
 			par_transform.active_ctl2model_ip(pars_real);
 		else if (tstat == ParameterEnsemble::transStatus::NUM)
 			par_transform.numeric2model_ip(pars_real);
-		replace_fixed(rname, pars_real);
+		replace_fixed(rname, pars_real, true);
 		nn = pars_real.get_notnormal_keys();
 		if (nn.size() > 0) {
             stringstream ss;
@@ -2433,19 +2433,7 @@ void ParameterEnsemble::prep_par_ensemble_after_read(map<string, int>& header_in
 			tied_names.push_back(name);
 		}
 	}
-//	vector<string> problems;
-//	for (auto& name : fixed_names)
-//    {
-//	    if ((pi.get_parameter_rec_ptr(name)->scale != 1.0) ||
-//                (pi.get_parameter_rec_ptr(name)->offset != 0.0))
-//        {
-//	        problems.push_back(name);
-//        }
-//    }
-//	if (problems.size())
-//    {
-//        throw_ensemble_error("the following fixed parameters have been passed values but have non-trivial scale/offset, which is not supported",problems);
-//    }
+
 	pfinfo.set_fixed_names(fixed_names);
 	fill_fixed(header_info, fixed_names);
 	save_fixed(fixed_names);
@@ -3417,7 +3405,7 @@ void ParameterEnsemble::to_csv_by_reals(ofstream &csv, bool write_header)
 	}
 }
 
-void ParameterEnsemble::replace_fixed(string real_name,Parameters &pars)
+void ParameterEnsemble::replace_fixed(string real_name,Parameters &pars, bool to_model)
 {
 
 	map<string, double> rmap = pfinfo.get_real_fixed_values(real_name);
@@ -3426,10 +3414,12 @@ void ParameterEnsemble::replace_fixed(string real_name,Parameters &pars)
 	for (auto& r : rmap)
 	{
 		val = r.second;
-		scale = pest_scenario_ptr->get_ctl_parameter_info_ptr_4_mod()->get_parameter_rec_ptr(r.first)->scale;
-		offset = pest_scenario_ptr->get_ctl_parameter_info_ptr_4_mod()->get_parameter_rec_ptr(r.first)->offset;
-		val -= offset;
-		val /= scale;
+		if (!to_model) {
+			scale = pest_scenario_ptr->get_ctl_parameter_info_ptr_4_mod()->get_parameter_rec_ptr(r.first)->scale;
+			offset = pest_scenario_ptr->get_ctl_parameter_info_ptr_4_mod()->get_parameter_rec_ptr(r.first)->offset;
+			val -= offset;
+			val /= scale;
+		}
 		pars.update_rec(r.first, val);
 	}
 

src/libs/pestpp_common/Ensemble.h

@@ -208,7 +208,7 @@ class ParameterEnsemble : public Ensemble
 	transStatus tstat;
 	void save_fixed(vector<string>& fixed_names);
 	void fill_fixed(const map<string, int> &header_info, vector<string>& fixed_names);
-	void replace_fixed(string real_name,Parameters &pars);
+	void replace_fixed(string real_name,Parameters &pars,bool to_model=false);
 	void prep_par_ensemble_after_read(map<string,int>& header_info);
 	FixedParInfo pfinfo;
 };