final calc

main/main.cpp

@@ -70,7 +70,7 @@ class Methods
         Matrix<double, 3, 3> A;
         auto Y = v;
         auto point = start; 
-        while (point <= end)
+        while (point < end)
         {
 
             A = -step * (H0 + prof(point + step / 2.0, v0, n) * W);
@@ -94,7 +94,7 @@ class Methods
         Matrix<complex<double>, 3, 3> A2;
         Matrix<complex<double>, 3, 3> omega;
         auto point = start; 
-        while (point <= end)
+        while (point < end)
         {
             A1 = H0 + prof(point + c1 * step, v0, n) * W;
             A2 = H0 + prof(point + c2 * step, v0, n) * W;
@@ -129,7 +129,7 @@ class Methods
         Matrix<complex<double>, 3, 3> omega;
 
         auto point = start;
-        while (point <= end)
+        while (point < end)
         {
             A1 = H0 + prof(point + c1 * step, v0, n) * W;
             A2 = H0 + prof(point + c2 * step, v0, n) * W;
@@ -171,7 +171,7 @@ class Methods
         Matrix<double, 3, 3> A1, A2;
         auto Y = v;
         auto point = start;
-        while (point <= end)
+        while (point < end)
         {
             A1 = H0 + prof(point + c1 * step, v0, n) * W;
             A2 = H0 + prof(point + c2 * step, v0, n) * W;
@@ -210,7 +210,7 @@ class Methods
         Matrix<double, 3, 3> A1, A2, A3, Y1, Y2, Y3;
         auto Y = v;
         auto point = start;
-        while (point <= end)
+        while (point < end)
         {
             A1 = H0 + prof(point + c1 * step, v0, n) * W;
             A2 = H0 + prof(point + c2 * step, v0, n) * W;
@@ -398,7 +398,7 @@ int main(int argc, char *argv[])
     if (mthd == "M4") v = test.M4();
     if (mthd == "M6") v = test.M6();
     if (mthd == "Cf4") v = test.Cf4();
-    if (mthd == "Cf_3") v = test.Cf4_3();
+    if (mthd == "Cf4_3") v = test.Cf4_3();
 
     auto end_time = std::chrono::high_resolution_clock::now();
     std::chrono::duration<double> time = (end_time - start_time);

methods.py

@@ -7,7 +7,9 @@
 base_dir = 'main/'
 run_file = 'main'
 log_files_dir = 'logs/'
-runs = 1
+params_file = 'methods.json'
+runs = 10
+cores = 12
 
 
 def run(run_file, start, stop, step, method, output_file):
@@ -32,7 +34,7 @@ def get_list_process():
     list_process = []
 
     data = 0
-    with open('methods.json', 'r') as f:
+    with open(params_file, 'r') as f:
         data = f.read()
     data_json = json.loads(data)
 
@@ -91,7 +93,26 @@ def run_process(cores=4):
     start_time = time.time()
     print('start prgrm')
 
-    run_process()
+
+    log_files_dir = 'logs_0.1_0.15/'
+    params_file = 'methods_0.1_0.15.json'
+    run_process(cores=cores)
+
+    print('#'*80)
+    print('time = ', time.time() - start_time)
+    print('#'*80)
+
+    log_files_dir = 'logs_0.1_0.2/'
+    params_file = 'methods_0.1_0.2.json'
+    run_process(cores=cores)
+
+    print('#'*80)
+    print('time = ', time.time() - start_time)
+    print('#'*80)
+
+    log_files_dir = 'logs_0.1_0.25/'
+    params_file = 'methods_0.1_0.25.json'
+    run_process(cores=cores)
 
     print("end prgrm")
     print(time.time() - start_time)