Commit 7d667a47 authored by Florian Goth's avatar Florian Goth
Browse files

fix some things. Now we struggle with the inability to dump SSHLattices...

parent 9c9b6ade
Pipeline #10022 failed with stage
in 5 minutes and 57 seconds
......@@ -51,8 +51,6 @@
auto& mp = p.first; // Monte Carlo params
auto& hp = p.second; // Hamiltonian params
auto hpnew = std::tuple_cat(p, std::forward_as_tuple(latt));
std::string str_repid = std::to_string(mp.repid);
std::string str_k = "k"+std::to_string(std::get<2>(hp));
std::string str_g = "g"+std::to_string(std::get<3>(hp));
......@@ -66,7 +64,8 @@
std::string str_dtau = "dtau"+std::to_string(dtau);
mp.outname = str_Ltime+"_"+str_k+"_"+str_g+"_"+str_mu+"_"+str_dtau+"_"+str_repid;
return std::tuple_cat(std::forward_as_tuple(latt), p);
auto p3 = std::make_tuple(mp, std::tuple_cat(hp, std::forward_as_tuple(latt)));
return std::tuple_cat(std::forward_as_tuple(latt), p3 );
};
......
......@@ -117,9 +117,13 @@ void selectsim(RegistryDB& registry, std::string outbasedir, std::string logbase
}
latts.emplace_back(lat);
}
typedef decltype(finalize_parameter_pair(std::declval<MARQOV::Config>(), hp)) PPType;
typename GetSchedulerType<SSH<SSHLattice,double>, SSHLattice, typename PPType::value_type>::MarqovScheduler sched(1);
typedef decltype( finalize_parameter_pair(std::declval<MARQOV::Config>(),
std::declval<std::vector<decltype(std::tuple_cat(hp[0], std::forward_as_tuple(latts[0][0])))>>()
)) PPType;
typename GetSchedulerType<
SSH<SSHLattice, double>, SSHLattice, typename PPType::value_type>::MarqovScheduler sched(1);
for (std::size_t j=0; j<nL.size(); j++)
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment