Update

SpM-lab · Dec 24, 2024 · 79201c2 · 79201c2
1 parent e67487e
commit 79201c2
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 19 deletions.
diff --git a/include/sparseir/augment.hpp b/include/sparseir/augment.hpp
@@ -82,8 +82,8 @@ class TauLinear : public AbstractAugmentation {
     }
 
     std::complex<double> operator()(MatsubaraFreq<Fermionic> n) const override {
-        std::invalid_argument("TauConst is not a Fermionic basis.");
-        return std::numeric_limits<double>::quiet_NaN();
+        throw std::invalid_argument("TauConst is not a Fermionic basis.");
+        return std::numeric_limits<std::complex<double>>::quiet_NaN();
     }
 
     std::function<double(double)> deriv(int order = 1) const override {

diff --git a/include/sparseir/freq.hpp b/include/sparseir/freq.hpp
@@ -41,7 +41,7 @@ inline std::unique_ptr<Statistics> create_statistics(int zeta)
     throw std::domain_error("Unknown statistics type");
 }
 
-// Matsubara frequency class template
+// MatsubaraFreq class template
 template <typename S>
 class MatsubaraFreq {
     static_assert(std::is_base_of<Statistics, S>::value,
@@ -50,21 +50,36 @@ class MatsubaraFreq {
 public:
     int n;
 
-    inline MatsubaraFreq(int n) : n(n)
-    {
+    // コンストラクタ
+    inline MatsubaraFreq(int n) : n(n) {
+        static_assert(std::is_same<S, Fermionic>::value || std::is_same<S, Bosonic>::value,
+                      "S must be Fermionic or Bosonic");
         S stat;
-        if (!stat.allowed(n))
+        if (!stat.allowed(n)) {
             throw std::domain_error("Frequency is not allowed for this type");
+        }
+        instance_ = std::make_shared<S>(stat); // 適切な型のインスタンスを保持
     }
 
-    inline double value(double beta) const { return n * M_PI / beta; }
-    inline std::complex<double> value_im(double beta) const
-    {
+    // 値の計算
+    inline double value(double beta) const {
+        return n * M_PI / beta;
+    }
+
+    // 複素数の値
+    inline std::complex<double> value_im(double beta) const {
         return std::complex<double>(0, value(beta));
     }
 
-    inline S statistics() const { return S(); }
+    // 統計型の取得
+    inline S statistics() const { return *std::static_pointer_cast<S>(instance_); }
+
+    // n の取得
     inline int get_n() const { return n; }
+
+private:
+    // インスタンスを保持する共有ポインタ
+    std::shared_ptr<Statistics> instance_;
 };
 
 // Typedefs for convenience

diff --git a/test/augment.cxx b/test/augment.cxx
@@ -50,12 +50,22 @@ TEST_CASE("SparseIR Basis Functions", "[SparseIR]")
         REQUIRE_THROWS_AS(tl(-3), std::domain_error);
         REQUIRE_THROWS_AS(tl(321), std::domain_error);
         REQUIRE(tl.norm == Approx(std::sqrt(3.0 / 123.0)));
-        REQUIRE(tl(100) == std::sqrt(3.0 / 123.0) * (2.0 / (123. * 100.) - 1.));
-        // REQUIRE(tl(MatsubaraFreq(0)) == Approx(0.0));
-        // REQUIRE(tl(MatsubaraFreq(92)) ==
-        //         Approx(std::sqrt(3 / 123) * 2 / std::complex<double>(0, 1) *
-        //                123 / (92 * M_PI)));
-        // REQUIRE_THROWS_AS(tl(MatsubaraFreq(93)), std::runtime_error);
+        double tau = 100;
+        REQUIRE(tl(tau) == std::sqrt(3.0 / 123.0) * (2.0 / 123. * tau - 1.));
+
+        MatsubaraFreq<Bosonic> freq0(0);
+        REQUIRE(tl(freq0) == 0.0);
+        MatsubaraFreq<Bosonic> freq92(92);
+        // Calculate the expected complex value
+        std::complex<double> expected_value = std::sqrt(3. / 123.) * 2. / std::complex<double>(0, 1) * 123. / (92. * M_PI);
+        // Get the actual value from the function
+        std::complex<double> actual_value = tl(freq92);
+
+        REQUIRE(actual_value.real() == Approx(expected_value.real()));
+        REQUIRE(actual_value.imag() == Approx(expected_value.imag()));
+
+        MatsubaraFreq<Fermionic> freq93(93);
+        REQUIRE_THROWS_AS(tl(freq93), std::invalid_argument);
 
         //REQUIRE(sparseir::deriv(tl, 0) == tl);
         //REQUIRE(sparseir::deriv(tl)(4.2) ==
@@ -74,9 +84,12 @@ TEST_CASE("SparseIR Basis Functions", "[SparseIR]")
         REQUIRE_THROWS_AS(mc(321), std::domain_error);
 
         REQUIRE(std::isnan(mc(100)));
-        //REQUIRE(mc(MatsubaraFreq(0)) == Approx(1.0));
-        //REQUIRE(mc(MatsubaraFreq(92)) == Approx(1.0));
-        //REQUIRE(mc(MatsubaraFreq(93)) == Approx(1.0));
+        MatsubaraFreq<Bosonic> freq0(0);
+        REQUIRE(mc(freq0) == 1.0);
+        MatsubaraFreq<Bosonic> freq92(0);
+        REQUIRE(mc(freq92) == 1.0);
+        MatsubaraFreq<Fermionic> freq93(93);
+        REQUIRE(mc(freq93) == 1.0);
 
         //REQUIRE(sparseir::deriv(mc) == mc);
         //REQUIRE(sparseir::deriv(mc, 0) == mc);