1. rename some files and functions

PeizeLin · PeizeLin · commit 5877a580b401 · 2024-07-21T19:27:34.000+08:00
diff --git a/include/RI/global/Map_Operator.h b/include/RI/global/Map_Operator.h
@@ -53,6 +53,16 @@ namespace Map_Operator
 		return m;
 	}
 
+	// -m_in
+	template<typename Tkey, typename Tvalue>
+	std::map<Tkey,Tvalue> operator-(const std::map<Tkey,Tvalue> &m_in)
+	{
+		std::map<Tkey,Tvalue> m;
+		for(const auto &item : m_in)
+			m.emplace_hint(m.end(), item.first, -item.second);
+		return m;
+	}
+
 	// m1-m2
 	template<typename Tkey, typename Tvalue>
 	std::map<Tkey,Tvalue> operator-(const std::map<Tkey,Tvalue> &m1, const std::map<Tkey,Tvalue> &m2)
@@ -87,16 +97,6 @@ namespace Map_Operator
 		}
 		return m;
 	}
-
-	// -m_in
-	template<typename Tkey, typename Tvalue>
-	std::map<Tkey,Tvalue> operator-(const std::map<Tkey,Tvalue> &m_in)
-	{
-		std::map<Tkey,Tvalue> m;
-		for(const auto &item : m_in)
-			m.emplace_hint(m.end(), item.first, -item.second);
-		return m;
-	}
 }
 
 }
diff --git a/include/RI/ri/LRI-cal-loop4-b01.hpp b/include/RI/ri/LRI-cal-loop4-b01.hpp
diff --git a/include/RI/ri/LRI-cal-loop4-bx2.hpp b/include/RI/ri/LRI-cal-loop4-bx2.hpp
diff --git a/include/RI/ri/LRI-cal-loop4.hpp b/include/RI/ri/LRI-cal-loop4.hpp
@@ -18,7 +18,7 @@ namespace RI
 {
 
 template<typename TA, typename Tcell, std::size_t Ndim, typename Tdata>
-void LRI<TA,Tcell,Ndim,Tdata>::cal(
+void LRI<TA,Tcell,Ndim,Tdata>::cal_loop4(
 	const std::vector<Label::ab_ab> &labels,
 	std::vector<std::map<TA, std::map<TAC, Tensor<Tdata>>>> &Ds_result)
 {
diff --git a/include/RI/ri/LRI.h b/include/RI/ri/LRI.h
@@ -66,7 +66,7 @@ class LRI
 	//	const std::string &label,
 	//	const Tdata &threshold);
 
-	void cal(
+	void cal_loop4(
 		const std::vector<Label::ab_ab> &lables,
 		std::vector<std::map<TA, std::map<TAC, Tensor<Tdata>>>> &Ds_result);
 	void cal_loop3(
@@ -107,7 +107,7 @@ class LRI
 
 #include "LRI.hpp"
 #include "LRI-set.hpp"
-#include "LRI-cal.hpp"
-#include "LRI-cal-b01.hpp"
-#include "LRI-cal-bx2.hpp"
+#include "LRI-cal-loop4.hpp"
+#include "LRI-cal-loop4-b01.hpp"
+#include "LRI-cal-loop4-bx2.hpp"
 #include "LRI-cal_loop3.hpp"
diff --git a/unittests/Test_All.hpp b/unittests/Test_All.hpp
@@ -14,8 +14,8 @@
 #include "unittests/global/Tensor-test-3.hpp"
 #include "unittests/global/Tensor_Multiply-test.hpp"
 #include "unittests/global/Map_Operator-test.hpp"
-#include "unittests/ri/LRI-test.hpp"
-#include "unittests/ri/LRI_Loop3-test.hpp"
+#include "unittests/ri/LRI-loop4-test.hpp"
+#include "unittests/ri/LRI-loop3-test.hpp"
 #include "unittests/ri/LRI-speed-test.hpp"
 #include "unittests/ri/Cell_Nearest-test.hpp"
 #include "unittests/physics/Exx-test.hpp"
@@ -61,10 +61,10 @@ namespace Test_All
 		Map_Operator_Test::test_transform_map();
 		Map_Operator_Test::test_for_each_map();
 
-		LRI_Test::main<float>(argc, argv);
-		LRI_Test::main<double>(argc, argv);
-		LRI_Test::main<std::complex<float>>(argc, argv);
-		LRI_Test::main<std::complex<double>>(argc, argv);
+		LRI_Loop4_Test::main<float>(argc, argv);
+		LRI_Loop4_Test::main<double>(argc, argv);
+		LRI_Loop4_Test::main<std::complex<float>>(argc, argv);
+		LRI_Loop4_Test::main<std::complex<double>>(argc, argv);
 
 		LRI_Loop3_Test::main<float>(argc, argv);
 		LRI_Loop3_Test::main<double>(argc, argv);
diff --git a/unittests/comm/mix/Communicate_Tensors-test.hpp b/unittests/comm/mix/Communicate_Tensors-test.hpp
@@ -7,8 +7,8 @@
 
 #include "RI/comm/mix/Communicate_Tensors_Map_Judge.h"
 #include "RI/global/MPI_Wrapper.h"
-#include "unittests/print_stl.h"
 #include "unittests/global/Tensor-test.h"
+#include "unittests/print_stl.h"
 
 #include <mpi.h>
 #include <map>
diff --git a/unittests/global/Tensor-test.h b/unittests/global/Tensor-test.h
@@ -63,7 +63,6 @@ std::ostream &operator<<(std::ostream &os, const RI::Tensor<T> &t)
 	}
 }
 
-
 //int main1()
 //{
 //	RI::Tensor<double> t1({2,3});
diff --git a/unittests/print_stl.h b/unittests/print_stl.h
@@ -12,6 +12,21 @@
 #include <tuple>
 #include <iostream>
 
+	template<typename T>
+	std::ostream &operator<<(std::ostream &os, const std::vector<T> &v);
+	template<typename T0, typename T1>
+	std::ostream &operator<<(std::ostream &os, const std::tuple<T0,T1> &t);
+	template<typename T>
+	std::ostream &operator<<(std::ostream &os, const std::set<T> &s);
+	template<typename T, std::size_t N>
+	std::ostream &operator<<(std::ostream &os, const std::array<T,N> &v);
+	template<typename Tkey, typename Tvalue>
+	std::ostream &operator<<(std::ostream &os, const std::pair<Tkey,Tvalue> &p);
+	template<typename Tkey, typename Tvalue>
+	std::ostream &operator<<(std::ostream &os, const std::map<Tkey,Tvalue> &m);
+	template<typename T0, typename T1>
+	std::ostream &operator<<(std::ostream &os, const std::tuple<T0,T1> &t);
+
 template<typename T>
 std::ostream &operator<<(std::ostream &os, const std::vector<T> &v)
 {
diff --git a/unittests/ri/LRI-loop3-test.hpp b/unittests/ri/LRI-loop3-test.hpp
diff --git a/unittests/ri/LRI-loop4-test.hpp b/unittests/ri/LRI-loop4-test.hpp
@@ -27,7 +27,7 @@
 						for(std::size_t ib2=0; ib2<Nb2; ++ib2)
 
 
-namespace LRI_Test
+namespace LRI_Loop4_Test
 {
 	template<typename TA, typename Tcell, std::size_t Ndim, typename Tdata>
 	class Parallel_LRI_test: public RI::Parallel_LRI_Equally<TA,Tcell,Ndim,Tdata>
@@ -109,7 +109,7 @@ namespace LRI_Test
 
 		{
 			std::vector<T_Ds> Ds_result;
-			lri.cal({RI::Label::ab_ab::a0b0_a1b1}, Ds_result);
+			lri.cal_loop4({RI::Label::ab_ab::a0b0_a1b1}, Ds_result);
 			RI::Tensor<Tdata> D_test({Na2,Nb2});
 			FOR_ia012_ib012
 				D_test(ia2,ib2) +=
@@ -122,7 +122,7 @@ namespace LRI_Test
 
 		{
 			std::vector<T_Ds> Ds_result;
-			lri.cal({RI::Label::ab_ab::a0b1_a1b0}, Ds_result);
+			lri.cal_loop4({RI::Label::ab_ab::a0b1_a1b0}, Ds_result);
 			RI::Tensor<Tdata> D_test({Na2,Nb2});
 			FOR_ia012_ib012
 				D_test(ia2,ib2) +=
@@ -135,7 +135,7 @@ namespace LRI_Test
 
 		{
 			std::vector<T_Ds> Ds_result;
-			lri.cal({RI::Label::ab_ab::a0b0_a2b1}, Ds_result);
+			lri.cal_loop4({RI::Label::ab_ab::a0b0_a2b1}, Ds_result);
 			RI::Tensor<Tdata> D_test({Na1,Nb2});
 			FOR_ia012_ib012
 				D_test(ia1,ib2) +=
@@ -148,7 +148,7 @@ namespace LRI_Test
 
 		{
 			std::vector<T_Ds> Ds_result;
-			lri.cal({RI::Label::ab_ab::a0b1_a2b0}, Ds_result);
+			lri.cal_loop4({RI::Label::ab_ab::a0b1_a2b0}, Ds_result);
 			RI::Tensor<Tdata> D_test({Na1,Nb2});
 			FOR_ia012_ib012
 				D_test(ia1,ib2) +=
@@ -161,7 +161,7 @@ namespace LRI_Test
 
 		{
 			std::vector<T_Ds> Ds_result;
-			lri.cal({RI::Label::ab_ab::a1b0_a2b1}, Ds_result);
+			lri.cal_loop4({RI::Label::ab_ab::a1b0_a2b1}, Ds_result);
 			RI::Tensor<Tdata> D_test({Na0,Nb2});
 			FOR_ia012_ib012
 				D_test(ia0,ib2) +=
@@ -174,7 +174,7 @@ namespace LRI_Test
 
 		{
 			std::vector<T_Ds> Ds_result;
-			lri.cal({RI::Label::ab_ab::a1b1_a2b0}, Ds_result);
+			lri.cal_loop4({RI::Label::ab_ab::a1b1_a2b0}, Ds_result);
 			RI::Tensor<Tdata> D_test({Na0,Nb2});
 			FOR_ia012_ib012
 				D_test(ia0,ib2) +=
@@ -187,7 +187,7 @@ namespace LRI_Test
 
 		{
 			std::vector<T_Ds> Ds_result;
-			lri.cal({RI::Label::ab_ab::a0b0_a1b2}, Ds_result);
+			lri.cal_loop4({RI::Label::ab_ab::a0b0_a1b2}, Ds_result);
 			RI::Tensor<Tdata> D_test({Na2,Nb1});
 			FOR_ia012_ib012
 				D_test(ia2,ib1) +=
@@ -200,7 +200,7 @@ namespace LRI_Test
 
 		{
 			std::vector<T_Ds> Ds_result;
-			lri.cal({RI::Label::ab_ab::a0b1_a1b2}, Ds_result);
+			lri.cal_loop4({RI::Label::ab_ab::a0b1_a1b2}, Ds_result);
 			RI::Tensor<Tdata> D_test({Na2,Nb0});
 			FOR_ia012_ib012
 				D_test(ia2,ib0) +=
@@ -213,7 +213,7 @@ namespace LRI_Test
 
 		{
 			std::vector<T_Ds> Ds_result;
-			lri.cal({RI::Label::ab_ab::a0b2_a1b0}, Ds_result);
+			lri.cal_loop4({RI::Label::ab_ab::a0b2_a1b0}, Ds_result);
 			RI::Tensor<Tdata> D_test({Na2,Nb1});
 			FOR_ia012_ib012
 				D_test(ia2,ib1) +=
@@ -226,7 +226,7 @@ namespace LRI_Test
 
 		{
 			std::vector<T_Ds> Ds_result;
-			lri.cal({RI::Label::ab_ab::a0b2_a1b1}, Ds_result);
+			lri.cal_loop4({RI::Label::ab_ab::a0b2_a1b1}, Ds_result);
 			RI::Tensor<Tdata> D_test({Na2,Nb0});
 			FOR_ia012_ib012
 				D_test(ia2,ib0) +=
@@ -239,7 +239,7 @@ namespace LRI_Test
 
 		{
 			std::vector<T_Ds> Ds_result;
-			lri.cal({RI::Label::ab_ab::a0b0_a2b2}, Ds_result);
+			lri.cal_loop4({RI::Label::ab_ab::a0b0_a2b2}, Ds_result);
 			RI::Tensor<Tdata> D_test({Na1,Nb1});
 			FOR_ia012_ib012
 				D_test(ia1,ib1) +=
@@ -252,7 +252,7 @@ namespace LRI_Test
 
 		{
 			std::vector<T_Ds> Ds_result;
-			lri.cal({RI::Label::ab_ab::a0b1_a2b2}, Ds_result);
+			lri.cal_loop4({RI::Label::ab_ab::a0b1_a2b2}, Ds_result);
 			RI::Tensor<Tdata> D_test({Na1,Nb0});
 			FOR_ia012_ib012
 				D_test(ia1,ib0) +=
@@ -265,7 +265,7 @@ namespace LRI_Test
 
 		{
 			std::vector<T_Ds> Ds_result;
-			lri.cal({RI::Label::ab_ab::a0b2_a2b0}, Ds_result);
+			lri.cal_loop4({RI::Label::ab_ab::a0b2_a2b0}, Ds_result);
 			RI::Tensor<Tdata> D_test({Na1,Nb1});
 			FOR_ia012_ib012
 				D_test(ia1,ib1) +=
@@ -278,7 +278,7 @@ namespace LRI_Test
 
 		{
 			std::vector<T_Ds> Ds_result;
-			lri.cal({RI::Label::ab_ab::a0b2_a2b1}, Ds_result);
+			lri.cal_loop4({RI::Label::ab_ab::a0b2_a2b1}, Ds_result);
 			RI::Tensor<Tdata> D_test({Na1,Nb0});
 			FOR_ia012_ib012
 				D_test(ia1,ib0) +=
@@ -291,7 +291,7 @@ namespace LRI_Test
 
 		{
 			std::vector<T_Ds> Ds_result;
-			lri.cal({RI::Label::ab_ab::a1b0_a2b2}, Ds_result);
+			lri.cal_loop4({RI::Label::ab_ab::a1b0_a2b2}, Ds_result);
 			RI::Tensor<Tdata> D_test({Na0,Nb1});
 			FOR_ia012_ib012
 				D_test(ia0,ib1) +=
@@ -304,7 +304,7 @@ namespace LRI_Test
 
 		{
 			std::vector<T_Ds> Ds_result;
-			lri.cal({RI::Label::ab_ab::a1b1_a2b2}, Ds_result);
+			lri.cal_loop4({RI::Label::ab_ab::a1b1_a2b2}, Ds_result);
 			RI::Tensor<Tdata> D_test({Na0,Nb0});
 			FOR_ia012_ib012
 				D_test(ia0,ib0) +=
@@ -317,7 +317,7 @@ namespace LRI_Test
 
 		{
 			std::vector<T_Ds> Ds_result;
-			lri.cal({RI::Label::ab_ab::a1b2_a2b0}, Ds_result);
+			lri.cal_loop4({RI::Label::ab_ab::a1b2_a2b0}, Ds_result);
 			RI::Tensor<Tdata> D_test({Na0,Nb1});
 			FOR_ia012_ib012
 				D_test(ia0,ib1) +=
@@ -330,7 +330,7 @@ namespace LRI_Test
 
 		{
 			std::vector<T_Ds> Ds_result;
-			lri.cal({RI::Label::ab_ab::a1b2_a2b1}, Ds_result);
+			lri.cal_loop4({RI::Label::ab_ab::a1b2_a2b1}, Ds_result);
 			RI::Tensor<Tdata> D_test({Na0,Nb0});
 			FOR_ia012_ib012
 				D_test(ia0,ib0) +=
diff --git a/unittests/ri/LRI-speed-test.hpp b/unittests/ri/LRI-speed-test.hpp
@@ -90,7 +90,7 @@ namespace LRI_Speed_Test
 		gettimeofday(&t_begin, NULL);
 
 		std::vector<T_Ds> Ds_result(1);
-		lri.cal(RI::Global_Func::to_vector(RI::Label::array_ab_ab), Ds_result);
+		lri.cal_loop3(RI::Global_Func::to_vector(RI::Label::array_ab_ab), Ds_result);
 
 		std::cout<<time_during(t_begin)<<std::endl;
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ namespace RI`
`18`	`18`	`{`
`19`	`19`
`20`	`20`	`template<typename TA, typename Tcell, std::size_t Ndim, typename Tdata>`
`21`		`-void LRI<TA,Tcell,Ndim,Tdata>::cal(`
	`21`	`+void LRI<TA,Tcell,Ndim,Tdata>::cal_loop4(`
`22`	`22`	`const std::vector<Label::ab_ab> &labels,`
`23`	`23`	`std::vector<std::map<TA, std::map<TAC, Tensor<Tdata>>>> &Ds_result)`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,6 @@ std::ostream &operator<<(std::ostream &os, const RI::Tensor<T> &t)`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`66`		`-`
`67`	`66`	`//int main1()`
`68`	`67`	`//{`
`69`	`68`	`// RI::Tensor<double> t1({2,3});`