Skip to content

Commit

Permalink
Stop using "cached" testdata in test_export.py
Browse files Browse the repository at this point in the history
  • Loading branch information
yngve-sk committed Dec 10, 2024
1 parent ad786d8 commit 8e00339
Show file tree
Hide file tree
Showing 8 changed files with 86 additions and 141 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
,batch,sim_avg_obj,is_gradient,realization,start_time,end_time,success,realization_weight,simulation,distance_p,distance_p_norm,distance_p_weighted_norm,distance_q,distance_q_norm,distance_q_weighted_norm,point_x,point_y,point_z,real_avg_obj,increased_merit,gradient-distance_p-point_x,gradient-distance_p-point_y,gradient-distance_p-point_z,gradient-distance_q-point_x,gradient-distance_q-point_y,gradient-distance_q-point_z
0,0,-2.3333,0,0,1725344867.0882,1725344867.1048,1,1,0,-0.75,-1.125,-0.75,-4.75,-4.75,-1.5833,0.0,0.0,0.0,-2.3333,1.0,0.9959,0.9887,1.0047,-3.0046,-3.0114,1.0045
1,0,0.0,1,0,1725344867.1005,,1,1,0,,,,,,,0.0077,-0.005,-0.0205,,,,,,,,
2,0,-2.3402,1,0,1725344867.101,1725344867.106,1,1,1,-0.75,-1.125,-0.75,-4.7708,-4.7708,-1.5903,-0.0001,0.0053,-0.0051,,,,,,,,
3,0,-2.3272,1,0,1725344867.1016,1725344867.1072,1,1,2,-0.7553,-1.133,-0.7553,-4.7157,-4.7157,-1.5719,-0.0029,-0.007,0.0047,,,,,,,,
4,0,-2.3263,1,0,1725344867.1021,1725344867.1083,1,1,3,-0.7417,-1.1126,-0.7417,-4.7537,-4.7537,-1.5846,-0.0115,0.0145,0.0057,,,,,,,,
5,0,-2.3113,1,0,1725344867.1026,1725344867.1095,1,1,4,-0.7334,-1.1001,-0.7334,-4.7338,-4.7338,-1.5779,0.0013,-0.0012,0.0168,,,,,,,,
6,1,-2.3335,0,0,1725344867.4911,1725344867.4928,1,1,0,-0.7657,-1.1485,-0.7657,-4.7036,-4.7036,-1.5679,-0.0042,-0.0113,1.0,-2.3335,0.0,,,,,,
7,2,-2.0,0,0,1725344867.8464,1725344867.8476,1,1,0,-0.5078,-0.7617,-0.5078,-4.4768,-4.4768,-1.4923,-0.0021,-0.0056,0.4999,-2.0,1.0,,,,,,
,batch,sim_avg_obj,is_gradient,realization,success,realization_weight,simulation,distance_p,distance_p_norm,distance_p_weighted_norm,distance_q,distance_q_norm,distance_q_weighted_norm,point_x,point_y,point_z,real_avg_obj,increased_merit,gradient-distance_p-point_x,gradient-distance_p-point_y,gradient-distance_p-point_z,gradient-distance_q-point_x,gradient-distance_q-point_y,gradient-distance_q-point_z
0,0,-2.3333,0,0,1,1,0,-0.75,-1.125,-0.75,-4.75,-4.75,-1.5833,0.0,0.0,0.0,-2.3333,1.0,0.9959,0.9887,1.0047,-3.0046,-3.0114,1.0045
1,0,0.0,1,0,1,1,0,,,,,,,0.0077,-0.005,-0.0205,,,,,,,,
2,0,-2.3402,1,0,1,1,1,-0.75,-1.125,-0.75,-4.7708,-4.7708,-1.5903,-0.0001,0.0053,-0.0051,,,,,,,,
3,0,-2.3272,1,0,1,1,2,-0.7553,-1.133,-0.7553,-4.7157,-4.7157,-1.5719,-0.0029,-0.007,0.0047,,,,,,,,
4,0,-2.3263,1,0,1,1,3,-0.7417,-1.1126,-0.7417,-4.7537,-4.7537,-1.5846,-0.0115,0.0145,0.0057,,,,,,,,
5,0,-2.3113,1,0,1,1,4,-0.7334,-1.1001,-0.7334,-4.7338,-4.7338,-1.5779,0.0013,-0.0012,0.0168,,,,,,,,
6,1,-2.3335,0,0,1,1,0,-0.7656,-1.1485,-0.7656,-4.7036,-4.7036,-1.5679,-0.0042,-0.0113,1.0,-2.3335,0.0,,,,,,
7,2,-2.0,0,0,1,1,0,-0.5078,-0.7617,-0.5078,-4.4768,-4.4768,-1.4923,-0.0021,-0.0056,0.4999,-2.0,1.0,,,,,,
Original file line number Diff line number Diff line change
@@ -1,21 +1,2 @@
sim_date,FOPR,FOPT,batch,sim_avg_obj,is_gradient,realization,success,realization_weight,npv_function,npv_function_norm,npv_function_weighted_norm,group_sum,group_sum_norm,group_sum_weighted_norm,group_w00,group_w01,group_w02,group_w03
2010-11-21,3240.0,3240.0,2,1115.317,1,0,1,0.5,1886.01,1886.01,943.005,0.3446,344.624,172.312,0.0825,0.0987,0.0818,0.0816
2010-11-21,3240.0,3240.0,2,1117.514,1,0,1,0.5,1886.01,1886.01,943.005,0.349,349.018,174.509,0.0888,0.0969,0.0796,0.0838
2010-11-21,3240.0,3240.0,2,1109.3895,1,1,1,0.5,1886.01,1886.01,943.005,0.3328,332.769,166.3845,0.0752,0.0984,0.0783,0.0808
2010-11-21,3240.0,3240.0,2,1110.811,1,1,1,0.5,1886.01,1886.01,943.005,0.3356,335.612,167.806,0.082,0.0944,0.0809,0.0782
2011-11-21,6890.0,6890.0,2,1115.317,1,0,1,0.5,1886.01,1886.01,943.005,0.3446,344.624,172.312,0.0825,0.0987,0.0818,0.0816
2011-11-21,6890.0,6890.0,2,1117.514,1,0,1,0.5,1886.01,1886.01,943.005,0.349,349.018,174.509,0.0888,0.0969,0.0796,0.0838
2011-11-21,6890.0,6890.0,2,1109.3895,1,1,1,0.5,1886.01,1886.01,943.005,0.3328,332.769,166.3845,0.0752,0.0984,0.0783,0.0808
2011-11-21,6890.0,6890.0,2,1110.811,1,1,1,0.5,1886.01,1886.01,943.005,0.3356,335.612,167.806,0.082,0.0944,0.0809,0.0782
2012-11-20,10540.0,10540.0,2,1115.317,1,0,1,0.5,1886.01,1886.01,943.005,0.3446,344.624,172.312,0.0825,0.0987,0.0818,0.0816
2012-11-20,10540.0,10540.0,2,1117.514,1,0,1,0.5,1886.01,1886.01,943.005,0.349,349.018,174.509,0.0888,0.0969,0.0796,0.0838
2012-11-20,10540.0,10540.0,2,1109.3895,1,1,1,0.5,1886.01,1886.01,943.005,0.3328,332.769,166.3845,0.0752,0.0984,0.0783,0.0808
2012-11-20,10540.0,10540.0,2,1110.811,1,1,1,0.5,1886.01,1886.01,943.005,0.3356,335.612,167.806,0.082,0.0944,0.0809,0.0782
2013-11-20,14190.0,14190.0,2,1115.317,1,0,1,0.5,1886.01,1886.01,943.005,0.3446,344.624,172.312,0.0825,0.0987,0.0818,0.0816
2013-11-20,14190.0,14190.0,2,1117.514,1,0,1,0.5,1886.01,1886.01,943.005,0.349,349.018,174.509,0.0888,0.0969,0.0796,0.0838
2013-11-20,14190.0,14190.0,2,1109.3895,1,1,1,0.5,1886.01,1886.01,943.005,0.3328,332.769,166.3845,0.0752,0.0984,0.0783,0.0808
2013-11-20,14190.0,14190.0,2,1110.811,1,1,1,0.5,1886.01,1886.01,943.005,0.3356,335.612,167.806,0.082,0.0944,0.0809,0.0782
2014-11-20,17840.0,17840.0,2,1115.317,1,0,1,0.5,1886.01,1886.01,943.005,0.3446,344.624,172.312,0.0825,0.0987,0.0818,0.0816
2014-11-20,17840.0,17840.0,2,1117.514,1,0,1,0.5,1886.01,1886.01,943.005,0.349,349.018,174.509,0.0888,0.0969,0.0796,0.0838
2014-11-20,17840.0,17840.0,2,1109.3895,1,1,1,0.5,1886.01,1886.01,943.005,0.3328,332.769,166.3845,0.0752,0.0984,0.0783,0.0808
2014-11-20,17840.0,17840.0,2,1110.811,1,1,1,0.5,1886.01,1886.01,943.005,0.3356,335.612,167.806,0.082,0.0944,0.0809,0.0782
batch,sim_avg_obj,is_gradient,realization,success,realization_weight,distance_p,distance_p_norm,distance_p_weighted_norm,distance_q,distance_q_norm,distance_q_weighted_norm,point_x,point_y,point_z,real_avg_obj,increased_merit
2,-2.0,0,0,1,1,-0.5078,-0.7617,-0.5078,-4.4768,-4.4768,-1.4923,-0.0021,-0.0056,0.4999,-2.0,1
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
,batch,sim_avg_obj,is_gradient,realization,start_time,end_time,success,realization_weight,simulation,distance_p,distance_p_norm,distance_p_weighted_norm,distance_q,distance_q_norm,distance_q_weighted_norm,point_x,point_y,point_z,real_avg_obj,increased_merit,gradient-distance_p-point_x,gradient-distance_p-point_y,gradient-distance_p-point_z,gradient-distance_q-point_x,gradient-distance_q-point_y,gradient-distance_q-point_z
0,0,-2.3333,0,0,1725344867.0882,1725344867.1048,1,1,0,-0.75,-1.125,-0.75,-4.75,-4.75,-1.5833,0.0,0.0,0.0,-2.3333,1,0.9959,0.9887,1.0047,-3.0046,-3.0114,1.0045
1,2,-2.0,0,0,1725344867.8464,1725344867.8476,1,1,0,-0.5078,-0.7617,-0.5078,-4.4768,-4.4768,-1.4923,-0.0021,-0.0056,0.4999,-2.0,1,,,,,,
,batch,sim_avg_obj,is_gradient,realization,success,realization_weight,simulation,distance_p,distance_p_norm,distance_p_weighted_norm,distance_q,distance_q_norm,distance_q_weighted_norm,point_x,point_y,point_z,real_avg_obj,increased_merit,gradient-distance_p-point_x,gradient-distance_p-point_y,gradient-distance_p-point_z,gradient-distance_q-point_x,gradient-distance_q-point_y,gradient-distance_q-point_z
0,0,-2.3333,0,0,1,1,0,-0.75,-1.125,-0.75,-4.75,-4.75,-1.5833,0.0,0.0,0.0,-2.3333,1,0.9959,0.9887,1.0047,-3.0046,-3.0114,1.0045
1,2,-2.0,0,0,1,1,0,-0.5078,-0.7617,-0.5078,-4.4768,-4.4768,-1.4923,-0.0021,-0.0056,0.4999,-2.0,1,,,,,,
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
,batch,sim_avg_obj,is_gradient,realization,start_time,end_time,success,realization_weight,simulation,distance_p,distance_p_norm,distance_p_weighted_norm,distance_q,distance_q_norm,distance_q_weighted_norm,point_x,point_y,point_z,real_avg_obj,increased_merit
0,2,-2.0,0,0,1725344867.8464,1725344867.8476,1,1,0,-0.5078,-0.7617,-0.5078,-4.4768,-4.4768,-1.4923,-0.0021,-0.0056,0.4999,-2.0,1
,batch,sim_avg_obj,is_gradient,realization,success,realization_weight,simulation,distance_p,distance_p_norm,distance_p_weighted_norm,distance_q,distance_q_norm,distance_q_weighted_norm,point_x,point_y,point_z,real_avg_obj,increased_merit
0,2,-2.0,0,0,1,1,0,-0.5078,-0.7617,-0.5078,-4.4768,-4.4768,-1.4923,-0.0021,-0.0056,0.4999,-2.0,1
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
,batch,sim_avg_obj,is_gradient,realization,start_time,end_time,success,realization_weight,simulation,distance_p,distance_p_norm,distance_p_weighted_norm,distance_q,distance_q_norm,distance_q_weighted_norm,point_x,point_y,point_z,real_avg_obj,increased_merit,gradient-distance_p-point_x,gradient-distance_p-point_y,gradient-distance_p-point_z,gradient-distance_q-point_x,gradient-distance_q-point_y,gradient-distance_q-point_z
0,0,-2.3333,0,0,1725344867.0882,1725344867.1048,1,1,0,-0.75,-1.125,-0.75,-4.75,-4.75,-1.5833,0.0,0.0,0.0,-2.3333,1.0,0.9959,0.9887,1.0047,-3.0046,-3.0114,1.0045
1,0,0.0,1,0,1725344867.1005,,1,1,0,,,,,,,0.0077,-0.005,-0.0205,,,,,,,,
2,0,-2.3402,1,0,1725344867.101,1725344867.106,1,1,1,-0.75,-1.125,-0.75,-4.7708,-4.7708,-1.5903,-0.0001,0.0053,-0.0051,,,,,,,,
3,0,-2.3272,1,0,1725344867.1016,1725344867.1072,1,1,2,-0.7553,-1.133,-0.7553,-4.7157,-4.7157,-1.5719,-0.0029,-0.007,0.0047,,,,,,,,
4,0,-2.3263,1,0,1725344867.1021,1725344867.1083,1,1,3,-0.7417,-1.1126,-0.7417,-4.7537,-4.7537,-1.5846,-0.0115,0.0145,0.0057,,,,,,,,
5,0,-2.3113,1,0,1725344867.1026,1725344867.1095,1,1,4,-0.7334,-1.1001,-0.7334,-4.7338,-4.7338,-1.5779,0.0013,-0.0012,0.0168,,,,,,,,
6,2,-2.0,0,0,1725344867.8464,1725344867.8476,1,1,0,-0.5078,-0.7617,-0.5078,-4.4768,-4.4768,-1.4923,-0.0021,-0.0056,0.4999,-2.0,1.0,,,,,,
,batch,sim_avg_obj,is_gradient,realization,success,realization_weight,simulation,distance_p,distance_p_norm,distance_p_weighted_norm,distance_q,distance_q_norm,distance_q_weighted_norm,point_x,point_y,point_z,real_avg_obj,increased_merit,gradient-distance_p-point_x,gradient-distance_p-point_y,gradient-distance_p-point_z,gradient-distance_q-point_x,gradient-distance_q-point_y,gradient-distance_q-point_z
0,0,-2.3333,0,0,1,1,0,-0.75,-1.125,-0.75,-4.75,-4.75,-1.5833,0.0,0.0,0.0,-2.3333,1.0,0.9959,0.9887,1.0047,-3.0046,-3.0114,1.0045
1,0,0.0,1,0,1,1,0,,,,,,,0.0077,-0.005,-0.0205,,,,,,,,
2,0,-2.3402,1,0,1,1,1,-0.75,-1.125,-0.75,-4.7708,-4.7708,-1.5903,-0.0001,0.0053,-0.0051,,,,,,,,
3,0,-2.3272,1,0,1,1,2,-0.7553,-1.133,-0.7553,-4.7157,-4.7157,-1.5719,-0.0029,-0.007,0.0047,,,,,,,,
4,0,-2.3263,1,0,1,1,3,-0.7417,-1.1126,-0.7417,-4.7537,-4.7537,-1.5846,-0.0115,0.0145,0.0057,,,,,,,,
5,0,-2.3113,1,0,1,1,4,-0.7334,-1.1001,-0.7334,-4.7338,-4.7338,-1.5779,0.0013,-0.0012,0.0168,,,,,,,,
6,2,-2.0,0,0,1,1,0,-0.5078,-0.7617,-0.5078,-4.4768,-4.4768,-1.4923,-0.0021,-0.0056,0.4999,-2.0,1.0,,,,,,
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
,batch,sim_avg_obj,is_gradient,realization,start_time,end_time,success,realization_weight,simulation,distance_p,distance_p_norm,distance_p_weighted_norm,distance_q,distance_q_norm,distance_q_weighted_norm,point_x,point_y,point_z,real_avg_obj,increased_merit,gradient-distance_p-point_x,gradient-distance_p-point_y,gradient-distance_p-point_z,gradient-distance_q-point_x,gradient-distance_q-point_y,gradient-distance_q-point_z
0,0,-2.3333,0,0,1725344867.0882,1725344867.1048,1,1,0,-0.75,-1.125,-0.75,-4.75,-4.75,-1.5833,0.0,0.0,0.0,-2.3333,1,0.9959,0.9887,1.0047,-3.0046,-3.0114,1.0045
1,1,-2.3335,0,0,1725344867.4911,1725344867.4928,1,1,0,-0.7657,-1.1485,-0.7657,-4.7036,-4.7036,-1.5679,-0.0042,-0.0113,1.0,-2.3335,0,,,,,,
2,2,-2.0,0,0,1725344867.8464,1725344867.8476,1,1,0,-0.5078,-0.7617,-0.5078,-4.4768,-4.4768,-1.4923,-0.0021,-0.0056,0.4999,-2.0,1,,,,,,
,batch,sim_avg_obj,is_gradient,realization,success,realization_weight,simulation,distance_p,distance_p_norm,distance_p_weighted_norm,distance_q,distance_q_norm,distance_q_weighted_norm,point_x,point_y,point_z,real_avg_obj,increased_merit,gradient-distance_p-point_x,gradient-distance_p-point_y,gradient-distance_p-point_z,gradient-distance_q-point_x,gradient-distance_q-point_y,gradient-distance_q-point_z
0,0,-2.3333,0,0,1,1,0,-0.75,-1.125,-0.75,-4.75,-4.75,-1.5833,0.0,0.0,0.0,-2.3333,1,0.9959,0.9887,1.0047,-3.0046,-3.0114,1.0045
1,1,-2.3335,0,0,1,1,0,-0.7656,-1.1485,-0.7656,-4.7036,-4.7036,-1.5679,-0.0042,-0.0113,1.0,-2.3335,0,,,,,,
2,2,-2.0,0,0,1,1,0,-0.5078,-0.7617,-0.5078,-4.4768,-4.4768,-1.4923,-0.0021,-0.0056,0.4999,-2.0,1,,,,,,
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
,batch,sim_avg_obj,is_gradient,realization,start_time,end_time,success,realization_weight,simulation,distance_p,distance_p_norm,distance_p_weighted_norm,distance_q,distance_q_norm,distance_q_weighted_norm,point_x,point_y,point_z,real_avg_obj,increased_merit,gradient-distance_p-point_x,gradient-distance_p-point_y,gradient-distance_p-point_z,gradient-distance_q-point_x,gradient-distance_q-point_y,gradient-distance_q-point_z
0,0,-2.3333,0,0,1725344867.0882,1725344867.1048,1,1,0,-0.75,-1.125,-0.75,-4.75,-4.75,-1.5833,0.0,0.0,0.0,-2.3333,1,0.9959,0.9887,1.0047,-3.0046,-3.0114,1.0045
1,2,-2.0,0,0,1725344867.8464,1725344867.8476,1,1,0,-0.5078,-0.7617,-0.5078,-4.4768,-4.4768,-1.4923,-0.0021,-0.0056,0.4999,-2.0,1,,,,,,
,batch,sim_avg_obj,is_gradient,realization,success,realization_weight,simulation,distance_p,distance_p_norm,distance_p_weighted_norm,distance_q,distance_q_norm,distance_q_weighted_norm,point_x,point_y,point_z,real_avg_obj,increased_merit,gradient-distance_p-point_x,gradient-distance_p-point_y,gradient-distance_p-point_z,gradient-distance_q-point_x,gradient-distance_q-point_y,gradient-distance_q-point_z
0,0,-2.3333,0,0,1,1,0,-0.75,-1.125,-0.75,-4.75,-4.75,-1.5833,0.0,0.0,0.0,-2.3333,1,0.9959,0.9887,1.0047,-3.0046,-3.0114,1.0045
1,2,-2.0,0,0,1,1,0,-0.5078,-0.7617,-0.5078,-4.4768,-4.4768,-1.4923,-0.0021,-0.0056,0.4999,-2.0,1,,,,,,
Loading

0 comments on commit 8e00339

Please sign in to comment.