Added total number of iters to hardcoded references

Author: lisawim

pySDC/projects/PinTSimE/battery_2condensators_model.py

@@ -149,31 +149,6 @@ def main(use_switch_estimator=True):
     dill.dump(stats, f)
     f.close()
 
-    # filter statistics by number of iterations
-    iter_counts = get_sorted(stats, type='niter', sortby='time')
-
-    # compute and print statistics
-    min_iter = 20
-    max_iter = 0
-
-    f = open('battery_2condensators_out.txt', 'w')
-    niters = np.array([item[1] for item in iter_counts])
-    out = '   Mean number of iterations: %4.2f' % np.mean(niters)
-    f.write(out + '\n')
-    print(out)
-    for item in iter_counts:
-        out = 'Number of iterations for time %4.2f: %1i' % item
-        f.write(out + '\n')
-        # print(out)
-        min_iter = min(min_iter, item[1])
-        max_iter = max(max_iter, item[1])
-
-    restarts = np.array(get_sorted(stats, type='restart', recomputed=False))[:, 1]
-    print("Restarts for dt: ", level_params['dt'], " -- ", np.sum(restarts))
-
-    assert np.mean(niters) <= 4, "Mean number of iterations is too high, got %s" % np.mean(niters)
-    f.close()
-
     recomputed = False
 
     check_solution(stats, use_switch_estimator)
@@ -250,6 +225,7 @@ def check_solution(stats, use_switch_estimator):
             'switch1': 1.6094379124373626,
             'switch2': 3.2184040405613974,
             'restarts': 2.0,
+            'sum_niters': 1588,
         }
 
     got = {
@@ -259,6 +235,7 @@ def check_solution(stats, use_switch_estimator):
         'switch1': data['switch1'],
         'switch2': data['switch2'],
         'restarts': data['restarts'],
+        'sum_niters': data['sum_niters'],
     }
 
     for key in expected.keys():
@@ -288,6 +265,7 @@ def get_data_dict(stats, use_switch_estimator, recomputed=False):
     data['switch1'] = np.array(get_recomputed(stats, type='switch', sortby='time'))[0, 1]
     data['switch2'] = np.array(get_recomputed(stats, type='switch', sortby='time'))[-1, 1]
     data['restarts'] = np.sum(np.array(get_sorted(stats, type='restart', recomputed=None, sortby='time'))[:, 1])
+    data['sum_niters'] = np.sum(np.array(get_sorted(stats, type='niter', recomputed=None, sortby='time'))[:, 1])
 
     return data
 

pySDC/projects/PinTSimE/battery_model.py

@@ -170,34 +170,12 @@ def main(dt, problem, sweeper, use_switch_estimator, use_adaptivity):
     # call main function to get things done...
     uend, stats = controller.run(u0=uinit, t0=t0, Tend=Tend)
 
-    # filter statistics by number of iterations
-    iter_counts = get_sorted(stats, type='niter', recomputed=False, sortby='time')
-
-    # compute and print statistics
-    min_iter = 20
-    max_iter = 0
-
     Path("data").mkdir(parents=True, exist_ok=True)
     fname = 'data/battery_{}_USE{}_USA{}.dat'.format(sweeper.__name__, use_switch_estimator, use_adaptivity)
     f = open(fname, 'wb')
     dill.dump(stats, f)
     f.close()
 
-    f = open('data/battery_out.txt', 'w')
-    niters = np.array([item[1] for item in iter_counts])
-    out = '   Mean number of iterations: %4.2f' % np.mean(niters)
-    f.write(out + '\n')
-    print(out)
-    for item in iter_counts:
-        out = 'Number of iterations for time %4.2f: %1i' % item
-        f.write(out + '\n')
-        print(out)
-        min_iter = min(min_iter, item[1])
-        max_iter = max(max_iter, item[1])
-
-    assert np.mean(niters) <= 4, "Mean number of iterations is too high, got %s" % np.mean(niters)
-    f.close()
-
     return stats, description
 
 
@@ -301,24 +279,26 @@ def check_solution(stats, problem, use_adaptivity, use_switch_estimator):
 
     if use_switch_estimator and use_adaptivity:
         if problem == 'battery':
-            msg = 'Error when using switch estimator and adaptivity for battery'
+            msg = 'Error when using switch estimator and adaptivity for battery:'
             expected = {
                 'cL': 0.5474500710994862,
                 'vC': 1.0019332967173764,
                 'dt': 0.011761752270047832,
                 'e_em': 8.001793672107738e-10,
                 'switches': 0.18232155791181945,
                 'restarts': 3.0,
+                'sum_niters': 44,
             }
         elif problem == 'battery_implicit':
-            msg = 'Error when using switch estimator and adaptivity for battery_implicit'
+            msg = 'Error when using switch estimator and adaptivity for battery_implicit:'
             expected = {
                 'cL': 0.5424577937840791,
                 'vC': 1.0001051105894005,
                 'dt': 0.01,
                 'e_em': 2.220446049250313e-16,
                 'switches': 0.1822923488448394,
                 'restarts': 6.0,
+                'sum_niters': 60,
             }
 
     got = {
@@ -328,6 +308,7 @@ def check_solution(stats, problem, use_adaptivity, use_switch_estimator):
         'e_em': data['e_em'][-1],
         'switches': data['switches'][-1],
         'restarts': data['restarts'],
+        'sum_niters': data['sum_niters'],
     }
 
     for key in expected.keys():
@@ -364,6 +345,7 @@ def get_data_dict(stats, use_adaptivity=True, use_switch_estimator=True, recompu
         data['switches'] = np.array(get_recomputed(stats, type='switch', sortby='time'))[:, 1]
     if use_adaptivity or use_switch_estimator:
         data['restarts'] = np.sum(np.array(get_sorted(stats, type='restart', recomputed=None, sortby='time'))[:, 1])
+    data['sum_niters'] = np.sum(np.array(get_sorted(stats, type='niter', recomputed=None, sortby='time'))[:, 1])
 
     return data
 

pySDC/projects/PinTSimE/estimation_check.py

@@ -116,22 +116,6 @@ def run(dt, problem, sweeper, use_switch_estimator, use_adaptivity, V_ref):
     # call main function to get things done...
     uend, stats = controller.run(u0=uinit, t0=t0, Tend=Tend)
 
-    Path("data").mkdir(parents=True, exist_ok=True)
-    fname = 'data/battery.dat'
-    f = open(fname, 'wb')
-    dill.dump(stats, f)
-    f.close()
-
-    # filter statistics by number of iterations
-    iter_counts = get_sorted(stats, type='niter', recomputed=False, sortby='time')
-
-    # compute and print statistics
-    f = open('data/battery_out.txt', 'w')
-    niters = np.array([item[1] for item in iter_counts])
-
-    assert np.mean(niters) <= 4, "Mean number of iterations is too high, got %s" % np.mean(niters)
-    f.close()
-
     return description, stats
 
 
@@ -182,7 +166,6 @@ def check(cwd='./'):
 
                     if use_SE or use_A:
                         restarts_sorted = np.array(get_sorted(stats, type='restart', recomputed=None))[:, 1]
-                        print('Restarts for dt={}: {}'.format(dt_item, np.sum(restarts_sorted)))
                         if use_SE and not use_A:
                             restarts_SE.append(np.sum(restarts_sorted))
 
@@ -342,7 +325,7 @@ def check_solution(stats, dt, problem, use_adaptivity, use_switch_estimator):
 
     if problem == 'battery':
         if use_switch_estimator and use_adaptivity:
-            msg = 'Error when using switch estimator and adaptivity for battery for dt={}'.format(dt)
+            msg = f'Error when using switch estimator and adaptivity for battery for dt={dt:.1e}:'
             if dt == 4e-2:
                 expected = {
                     'cL': 0.5525783945667581,
@@ -351,6 +334,7 @@ def check_solution(stats, dt, problem, use_adaptivity, use_switch_estimator):
                     'e_em': 6.21240694442804e-08,
                     'switches': 0.18231603298272345,
                     'restarts': 4.0,
+                    'sum_niters': 56,
                 }
             elif dt == 4e-3:
                 expected = {
@@ -360,6 +344,7 @@ def check_solution(stats, dt, problem, use_adaptivity, use_switch_estimator):
                     'e_em': 2.5628611677319668e-08,
                     'switches': 0.18230920573953438,
                     'restarts': 3.0,
+                    'sum_niters': 48,
                 }
 
             got = {
@@ -369,40 +354,45 @@ def check_solution(stats, dt, problem, use_adaptivity, use_switch_estimator):
                 'e_em': data['e_em'][-1],
                 'switches': data['switches'][-1],
                 'restarts': data['restarts'],
+                'sum_niters': data['sum_niters'],
             }
         elif use_switch_estimator and not use_adaptivity:
-            msg = 'Error when using switch estimator for battery for dt={}'.format(dt)
+            msg = f'Error when using switch estimator for battery for dt={dt:.1e}:'
             if dt == 4e-2:
                 expected = {
                     'cL': 0.6139093327509394,
                     'vC': 1.0010140038721593,
                     'switches': 0.1824302065533169,
                     'restarts': 1.0,
+                    'sum_niters': 48,
                 }
             elif dt == 4e-3:
                 expected = {
                     'cL': 0.5429509935448258,
                     'vC': 1.0001158309787614,
                     'switches': 0.18232183080236553,
                     'restarts': 1.0,
+                    'sum_niters': 392,
                 }
 
             got = {
                 'cL': data['cL'][-1],
                 'vC': data['vC'][-1],
                 'switches': data['switches'][-1],
                 'restarts': data['restarts'],
+                'sum_niters': data['sum_niters'],
             }
 
         elif not use_switch_estimator and use_adaptivity:
-            msg = 'Error when using adaptivity for battery for dt={}'.format(dt)
+            msg = f'Error when using adaptivity for battery for dt={dt:.1e}:'
             if dt == 4e-2:
                 expected = {
                     'cL': 0.5966289599915113,
                     'vC': 0.9923148791604984,
                     'dt': 0.03564958366355817,
                     'e_em': 6.210964231812e-08,
                     'restarts': 1.0,
+                    'sum_niters': 36,
                 }
             elif dt == 4e-3:
                 expected = {
@@ -411,6 +401,7 @@ def check_solution(stats, dt, problem, use_adaptivity, use_switch_estimator):
                     'dt': 0.022880524075396924,
                     'e_em': 1.1130212751453428e-08,
                     'restarts': 3.0,
+                    'sum_niters': 52,
                 }
 
             got = {
@@ -419,11 +410,12 @@ def check_solution(stats, dt, problem, use_adaptivity, use_switch_estimator):
                 'dt': data['dt'][-1],
                 'e_em': data['e_em'][-1],
                 'restarts': data['restarts'],
+                'sum_niters': data['sum_niters'],
             }
 
     elif problem == 'battery_implicit':
         if use_switch_estimator and use_adaptivity:
-            msg = 'Error when using switch estimator and adaptivity for battery_implicit for dt={}'.format(dt)
+            msg = f'Error when using switch estimator and adaptivity for battery_implicit for dt={dt:.1e}:'
             if dt == 4e-2:
                 expected = {
                     'cL': 0.6717104472882885,
@@ -432,6 +424,7 @@ def check_solution(stats, dt, problem, use_adaptivity, use_switch_estimator):
                     'e_em': 6.208836400567463e-08,
                     'switches': 0.18232158833761175,
                     'restarts': 3.0,
+                    'sum_niters': 36,
                 }
             elif dt == 4e-3:
                 expected = {
@@ -441,6 +434,7 @@ def check_solution(stats, dt, problem, use_adaptivity, use_switch_estimator):
                     'e_em': 2.220446049250313e-16,
                     'switches': 0.18230549652342606,
                     'restarts': 4.0,
+                    'sum_niters': 44,
                 }
 
             got = {
@@ -450,40 +444,45 @@ def check_solution(stats, dt, problem, use_adaptivity, use_switch_estimator):
                 'e_em': data['e_em'][-1],
                 'switches': data['switches'][-1],
                 'restarts': data['restarts'],
+                'sum_niters': data['sum_niters'],
             }
         elif use_switch_estimator and not use_adaptivity:
-            msg = 'Error when using switch estimator for battery_implicit for dt={}'.format(dt)
+            msg = f'Error when using switch estimator for battery_implicit for dt={dt:.1e}:'
             if dt == 4e-2:
                 expected = {
                     'cL': 0.613909968362315,
                     'vC': 1.0010140112484431,
                     'switches': 0.18243023230469263,
                     'restarts': 1.0,
+                    'sum_niters': 48,
                 }
             elif dt == 4e-3:
                 expected = {
                     'cL': 0.5429616576526073,
                     'vC': 1.0001158454740509,
                     'switches': 0.1823218812753008,
                     'restarts': 1.0,
+                    'sum_niters': 392,
                 }
 
             got = {
                 'cL': data['cL'][-1],
                 'vC': data['vC'][-1],
                 'switches': data['switches'][-1],
                 'restarts': data['restarts'],
+                'sum_niters': data['sum_niters'],
             }
 
         elif not use_switch_estimator and use_adaptivity:
-            msg = 'Error when using adaptivity for battery_implicit for dt={}'.format(dt)
+            msg = f'Error when using adaptivity for battery_implicit for dt={dt:.1e}:'
             if dt == 4e-2:
                 expected = {
                     'cL': 0.5556563012729733,
                     'vC': 0.9930947318467772,
                     'dt': 0.035507110551631804,
                     'e_em': 6.2098696185231e-08,
                     'restarts': 6.0,
+                    'sum_niters': 64,
                 }
             elif dt == 4e-3:
                 expected = {
@@ -492,6 +491,7 @@ def check_solution(stats, dt, problem, use_adaptivity, use_switch_estimator):
                     'dt': 0.03176025170463925,
                     'e_em': 4.0386798239033794e-08,
                     'restarts': 8.0,
+                    'sum_niters': 80,
                 }
 
             got = {
@@ -500,6 +500,7 @@ def check_solution(stats, dt, problem, use_adaptivity, use_switch_estimator):
                 'dt': data['dt'][-1],
                 'e_em': data['e_em'][-1],
                 'restarts': data['restarts'],
+                'sum_niters': data['sum_niters'],
             }
 
     for key in expected.keys():