NMRRWSims/cpp
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Smaller fixes

Browse Source
This commit is contained in:
Dominik Demuth
2026-03-08 13:43:51 +01:00
parent 86ec6b220a
commit 6579bb028b
6 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/motions/bimodalangle.cpp
View File

@@ -37,7 +37,7 @@ namespace motions {
auto parameter = BaseMotion::getParameters();
parameter["angle1"] = m_angle1 * 180 / M_PI;
parameter["angle2"] = m_angle2 * 180 / M_PI;
parameter["probality1"] = m_prob;
parameter["probability1"] = m_prob;
return parameter;
}

2
src/motions/sixsitejump.h
View File

@@ -20,7 +20,7 @@ namespace motions {
[[nodiscard]] std::string toString() const override;
private:
double m_chi{0.95531661812450927816385710251575775424341469501000549095969812932191204590}; // 54.74 deg
double m_chi{std::acos(-1.0 / 3.0)}; // 54.74 deg
std::array<double, 6> m_corners{};
int m_corner_idx{0};

8
src/sims.cpp
View File

@@ -9,12 +9,12 @@
void run_simulation(
Experiment& experiment,
std::unordered_map<std::string, double>& parameter,
std::unordered_map<std::string, double>& optional,
const std::unordered_map<std::string, double>& parameter,
const std::unordered_map<std::string, double>& optional,
Dynamics& dynamics,
std::mt19937_64& rng
) {
const int num_walker = static_cast<int>(parameter["num_walker"]);
const int num_walker = static_cast<int>(parameter.at("num_walker"));
dynamics.setParameters(parameter);
experiment.setup(parameter, optional);
@@ -107,7 +107,7 @@ Trajectory make_trajectory(
}
std::chrono::system_clock::time_point printStart(std::unordered_map<std::string, double> &optional) {
std::chrono::system_clock::time_point printStart(const std::unordered_map<std::string, double> &optional) {
const auto start = std::chrono::system_clock::now();
const time_t start_time = std::chrono::system_clock::to_time_t(start);

6
src/sims.h
View File

@@ -11,14 +11,14 @@
void run_simulation(
Experiment& experiment,
std::unordered_map<std::string, double>& parameter,
std::unordered_map<std::string, double>& optional,
const std::unordered_map<std::string, double>& parameter,
const std::unordered_map<std::string, double>& optional,
Dynamics& dynamics,
std::mt19937_64& rng);
Trajectory make_trajectory(Dynamics& dynamics, double t_max, std::mt19937_64& rng);
std::chrono::system_clock::time_point printStart(std::unordered_map<std::string, double> &optional);
std::chrono::system_clock::time_point printStart(const std::unordered_map<std::string, double> &optional);
void printEnd(std::chrono::system_clock::time_point start);
#endif //RWSIM_SIMS_H

3
src/utils/functions.cpp
View File

@@ -4,7 +4,8 @@
int nearest_index(const std::vector<double> &x_ref, const double x, int start=0) {
while (x > x_ref[start+1]) {
const int last = static_cast<int>(x_ref.size()) - 2;
while (start < last && x > x_ref[start+1]) {
start++;
}
return start;

4
src/utils/ranges.cpp
View File

@@ -14,6 +14,7 @@ std::vector<double> arange(const int size, const double spacing=1.) {
std::vector<double> linspace(const double start, const double stop, const int steps) {
std::vector<double> range;
range.reserve(steps);
if (steps == 0) {
return range;
@@ -34,6 +35,7 @@ std::vector<double> linspace(const double start, const double stop, const int st
std::vector<double> logspace(const double start, const double stop, const int steps) {
std::vector<double> range;
range.reserve(steps);
if (steps == 0) {
return range;
@@ -49,7 +51,7 @@ std::vector<double> logspace(const double start, const double stop, const int st
const double stepsize = (logstop-logstart) / (steps-1);
for (int i=0; i<steps; i++) {
range.push_back(pow(10, logstart + stepsize * i));
range.push_back(std::pow(10, logstart + stepsize * i));
}
return range;
}