Use unique_ptr instead of raw pointer
This commit is contained in:
@@ -1,21 +1,17 @@
|
||||
#include "sixsitejump.h"
|
||||
|
||||
#include <iomanip>
|
||||
#include <iostream>
|
||||
|
||||
#include "coordinates.h"
|
||||
|
||||
namespace motions {
|
||||
SixSiteOctahedronC3::SixSiteOctahedronC3(const double delta, const double eta, const double chi, std::mt19937_64& rng) :
|
||||
m_chi{chi*M_PI/180.},
|
||||
BaseMotion(std::string{"SixSiteOctahedral"}, delta, eta, rng) {}
|
||||
SixSiteOctahedronC3::SixSiteOctahedronC3(const double delta, const double eta, const double chi) :
|
||||
BaseMotion(std::string{"SixSiteOctahedral"}, delta, eta),
|
||||
m_chi{chi*M_PI/180.} {}
|
||||
|
||||
SixSiteOctahedronC3::SixSiteOctahedronC3(std::mt19937_64& rng) : BaseMotion(std::string{"SixSiteOctahedralC3"}, rng) {}
|
||||
SixSiteOctahedronC3::SixSiteOctahedronC3() : BaseMotion(std::string{"SixSiteOctahedralC3"}) {}
|
||||
|
||||
void SixSiteOctahedronC3::initialize() {
|
||||
const coordinates::SphericalPos c3_axis = draw_position();
|
||||
const auto [x, y, z] = spherical_to_xyz(c3_axis);
|
||||
const double alpha = 2. * M_PI * m_uni_dist(m_rng);
|
||||
void SixSiteOctahedronC3::initialize(std::mt19937_64& rng) {
|
||||
const coordinates::SphericalPos c3_axis = draw_position(rng);
|
||||
const double alpha = 2. * M_PI * m_uni_dist(rng);
|
||||
|
||||
const double m_chi_opposite = M_PI - m_chi;
|
||||
|
||||
@@ -24,17 +20,21 @@ namespace motions {
|
||||
m_corners[2*i+1] = omega_q(rotate(c3_axis, m_chi_opposite, alpha + i * 2./3.*M_PI + M_PI/3.));
|
||||
}
|
||||
|
||||
m_initial_omega = SixSiteOctahedronC3::jump();
|
||||
m_initial_omega = SixSiteOctahedronC3::jump(rng);
|
||||
}
|
||||
|
||||
|
||||
double SixSiteOctahedronC3::jump() {
|
||||
m_corner_idx += m_chooser(m_rng);
|
||||
double SixSiteOctahedronC3::jump(std::mt19937_64& rng) {
|
||||
m_corner_idx += m_chooser(rng);
|
||||
m_corner_idx %= 6;
|
||||
|
||||
return m_corners[m_corner_idx];
|
||||
}
|
||||
|
||||
std::unique_ptr<BaseMotion> SixSiteOctahedronC3::clone() const {
|
||||
return std::make_unique<SixSiteOctahedronC3>(*this);
|
||||
}
|
||||
|
||||
std::string SixSiteOctahedronC3::toString() const {
|
||||
return {"SixSiteOctahedral/angle=" + std::to_string(m_chi / M_PI * 180.)};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user