Commit 295684f0 authored by Jesse VanderWees's avatar Jesse VanderWees 🐘

move branch point

parent e06d4de2
......@@ -5,9 +5,9 @@ UTC,Q_in
2013-01-04 01:00:00,3.30
2013-01-05 01:00:00,4.35
2013-01-06 01:00:00,5.55
2013-01-07 01:00:00,7.20
2013-01-07 01:00:00,5.55
2013-01-08 01:00:00,5.55
2013-01-09 01:00:00,4.35
2013-01-10 01:00:00,3.30
2013-01-11 01:00:00,2.55
2013-01-12 01:00:00,1.95
2013-01-09 01:00:00,5.55
2013-01-10 01:00:00,5.55
2013-01-11 01:00:00,5.55
2013-01-12 01:00:00,5.55
......@@ -6,8 +6,8 @@ UTC,Q_in
2013-01-05 01:00:00,3.30
2013-01-06 01:00:00,3.75
2013-01-07 01:00:00,3.75
2013-01-08 01:00:00,3.30
2013-01-09 01:00:00,2.85
2013-01-10 01:00:00,2.40
2013-01-11 01:00:00,1.95
2013-01-12 01:00:00,1.50
2013-01-08 01:00:00,3.75
2013-01-09 01:00:00,3.75
2013-01-10 01:00:00,3.75
2013-01-11 01:00:00,3.75
2013-01-12 01:00:00,3.75
time,H_max,H_min,Q_in,Q_release,V_max,V_min,V_storage
2013-01-01 01:00:00,0.460000,0.440000,1.500000,0.000000,420860.554886,382552.000845,400000.000000
2013-01-02 01:00:00,0.460000,0.440000,1.950000,1.938478,420860.554886,382552.000845,400995.535049
2013-01-03 01:00:00,0.460000,0.440000,2.550000,2.550226,420860.554886,382552.000845,400975.998669
2013-01-04 01:00:00,0.460000,0.440000,3.300000,3.310621,420860.554886,382552.000845,400058.386209
2013-01-05 01:00:00,0.460000,0.440000,4.350000,4.531521,420860.554886,382552.000845,384374.935319
2013-01-06 01:00:00,0.460000,0.440000,5.550000,5.956544,420860.554886,382552.000845,349249.557569
2013-01-07 01:00:00,0.460000,0.440000,7.200000,6.000000,420860.554886,382552.000845,452929.552598
2013-01-08 01:00:00,0.460000,0.440000,5.550000,5.946848,420860.554886,382552.000845,418641.846678
2013-01-09 01:00:00,0.460000,0.440000,4.350000,4.527051,420860.554886,382552.000845,403344.610183
2013-01-10 01:00:00,0.460000,0.440000,3.300000,3.310475,420860.554886,382552.000845,402439.609290
2013-01-11 01:00:00,0.460000,0.440000,2.550000,2.546861,420860.554886,382552.000845,402710.828249
2013-01-12 01:00:00,0.460000,0.440000,1.950000,1.739819,420860.554886,382552.000845,420870.468899
2013-01-02 01:00:00,0.460000,0.440000,1.950000,1.929115,420860.554886,382552.000845,401804.485313
2013-01-03 01:00:00,0.460000,0.440000,2.550000,2.554278,420860.554886,382552.000845,401434.837957
2013-01-04 01:00:00,0.460000,0.440000,3.300000,3.307816,420860.554886,382552.000845,400759.497663
2013-01-05 01:00:00,0.460000,0.440000,4.350000,4.398156,420860.554886,382552.000845,396598.825650
2013-01-06 01:00:00,0.460000,0.440000,5.550000,5.495492,420860.554886,382552.000845,401308.293740
2013-01-07 01:00:00,0.460000,0.440000,5.550000,5.541704,420860.554886,382552.000845,402025.049128
2013-01-08 01:00:00,0.460000,0.440000,5.550000,5.548527,420860.554886,382552.000845,402152.343704
2013-01-09 01:00:00,0.460000,0.440000,5.550000,5.549161,420860.554886,382552.000845,402224.842495
2013-01-10 01:00:00,0.460000,0.440000,5.550000,5.546378,420860.554886,382552.000845,402537.807785
2013-01-11 01:00:00,0.460000,0.440000,5.550000,5.527892,420860.554886,382552.000845,404447.917164
2013-01-12 01:00:00,0.460000,0.440000,5.550000,5.359909,420860.554886,382552.000845,420871.805612
time,H_max,H_min,Q_in,Q_release,V_max,V_min,V_storage
2013-01-01 01:00:00,0.460000,0.440000,1.500000,0.000000,420860.554886,382552.000845,400000.000000
2013-01-02 01:00:00,0.460000,0.440000,1.950000,1.936694,420860.554886,382552.000845,401149.627867
2013-01-03 01:00:00,0.460000,0.440000,2.400000,2.398757,420860.554886,382552.000845,401256.983825
2013-01-04 01:00:00,0.460000,0.440000,2.850000,2.849763,420860.554886,382552.000845,401277.484770
2013-01-05 01:00:00,0.460000,0.440000,3.300000,3.300393,420860.554886,382552.000845,401243.487870
2013-01-06 01:00:00,0.460000,0.440000,3.750000,3.744645,420860.554886,382552.000845,401706.182652
2013-01-07 01:00:00,0.460000,0.440000,3.750000,3.744645,420860.554886,382552.000845,402168.876481
2013-01-08 01:00:00,0.460000,0.440000,3.300000,3.300393,420860.554886,382552.000845,402134.878115
2013-01-09 01:00:00,0.460000,0.440000,2.850000,2.849764,420860.554886,382552.000845,402155.291593
2013-01-10 01:00:00,0.460000,0.440000,2.400000,2.398841,420860.554886,382552.000845,402255.459669
2013-01-11 01:00:00,0.460000,0.440000,1.950000,1.942015,420860.554886,382552.000845,402945.387750
2013-01-12 01:00:00,0.460000,0.440000,1.500000,1.292533,420860.554886,382552.000845,420870.499481
2013-01-02 01:00:00,0.460000,0.440000,1.950000,1.929115,420860.554886,382552.000845,401804.485313
2013-01-03 01:00:00,0.460000,0.440000,2.400000,2.401028,420860.554886,382552.000845,401715.632705
2013-01-04 01:00:00,0.460000,0.440000,2.850000,2.849788,420860.554886,382552.000845,401733.941759
2013-01-05 01:00:00,0.460000,0.440000,3.300000,3.300382,420860.554886,382552.000845,401700.894524
2013-01-06 01:00:00,0.460000,0.440000,3.750000,3.744727,420860.554886,382552.000845,402156.447130
2013-01-07 01:00:00,0.460000,0.440000,3.750000,3.749933,420860.554886,382552.000845,402162.261280
2013-01-08 01:00:00,0.460000,0.440000,3.750000,3.750003,420860.554886,382552.000845,402161.977833
2013-01-09 01:00:00,0.460000,0.440000,3.750000,3.750001,420860.554886,382552.000845,402161.910557
2013-01-10 01:00:00,0.460000,0.440000,3.750000,3.749961,420860.554886,382552.000845,402165.316928
2013-01-11 01:00:00,0.460000,0.440000,3.750000,3.747213,420860.554886,382552.000845,402406.147563
2013-01-12 01:00:00,0.460000,0.440000,3.750000,3.536275,420860.554886,382552.000845,420871.948652
......@@ -49,6 +49,11 @@ class Example(GoalProgrammingMixin, ControlTreeMixin, CSVLookupTableMixin,
# Overide default csv_ensemble_mode = False from CSVMixin before calling pre()
csv_ensemble_mode = True
def control_tree_options(self):
options = super(Example, self).control_tree_options()
options['branching_times'] = self.times()[2:]
return options
def pre(self):
# Do the standard preprocessing
super(Example, self).pre()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment