Merge pull request #6 from pvstorageoptimization/dev

Dev

Author: pvstorageoptimization

README.rst

@@ -5,14 +5,14 @@ Optibess Algorithm - optimizing PV system combined with storage
 It uses data from *pvgis* and algorithms from the *pvlib* and *Nevergrad* python libraries, and is the backend part of
 the *Optibess* site.
 
-.. image:: https://github.com/pvstorageoptimization/Optibess_algorithm/workflows/Tests/badge.svg
+|tests status| |codecov status| |Documentation Status| |PyPI version shields.io|
+
+.. |tests status| image:: https://github.com/pvstorageoptimization/Optibess_algorithm/workflows/Tests/badge.svg
    :target: https://github.com/pvstorageoptimization/Optibess_algorithm/actions?query=workflow%3ATests
 
-.. image:: https://codecov.io/gh/pvstorageoptimization/Optibess_algorithm/graph/badge.svg?token=L3VLK1Y1SM
+.. |codecov status| image:: https://codecov.io/gh/pvstorageoptimization/Optibess_algorithm/graph/badge.svg?token=L3VLK1Y1SM
     :target: https://codecov.io/gh/pvstorageoptimization/Optibess_algorithm
 
-|Documentation Status| |PyPI version shields.io|
-
 .. |Documentation Status| image:: https://readthedocs.org/projects/optibess-algorithm/badge/?version=latest
    :target: http://optibess-algorithm.readthedocs.io/?badge=latest
 

optibess_algorithm/output_calculator.py

@@ -469,8 +469,8 @@ def producer_factor(self):
 
     @producer_factor.setter
     def producer_factor(self, value):
-        if not 0 < value <= 1:
-            raise ValueError("Producer factor should be between 0 (Exclusive) and 1 (inclusive)")
+        if not 0 < value <= 2:
+            raise ValueError("Producer factor should be between 0 (Exclusive) and 2 (inclusive)")
         self._producer_factor = value
 
     @property

optibess_algorithm/power_system_optimizer.py

@@ -222,7 +222,7 @@ def _set_variables(self):
                   set_integer_casting() for _ in range(self._initial_aug_num - 1)] + \
                  [ng.p.Scalar(init=0, lower=0, upper=self._first_entry_bound // 2).set_integer_casting()
                   for _ in range(self._max_aug_num - self._initial_aug_num)] + \
-                 [ng.p.Scalar(init=100, lower=1, upper=100).set_integer_casting()]
+                 [ng.p.Scalar(init=100, lower=1, upper=200).set_integer_casting()]
         self._instru = ng.p.Tuple(*params)
 
     def _set_constraints(self):

optibess_algorithm/producers.py

@@ -160,9 +160,10 @@ def _calc_pv_output(self):
                                                                    self._losses))
             tf = TimezoneFinder()
             self._time_zone = tf.timezone_at(lng=self._longitude, lat=self._latitude)
+        # take first 365 to deal with leap years
         year_one = datetime.datetime.today().year
         times = pd.date_range(start=f'{year_one}-01-01 00:00', end=f'{year_one}-12-31 23:00', freq='h',
-                              tz=self._time_zone)
+                              tz=self._time_zone)[:8760]
         self._power_output.index = times
         self._power_output.columns = ['pv_output']
 

requirements.txt

@@ -2,7 +2,7 @@ numpy>=1.24.2
 numpy-financial==1.0.0
 pandas>=2.1.3
 matplotlib>=3.7.1
-nevergrad==0.6.0
+nevergrad==1.0.1
 timezonefinder==6.1.9
 pvlib==0.10.2
 solarfactors>=1.5.3

tests/test_output_calculator.py

@@ -253,7 +253,7 @@ def test_producer_factor_incorrect_value(self):
         # check for error in setter
         with self.assertRaises(ValueError) as e:
             self.output.producer_factor = 0
-        self.assertEqual(str(e.exception), "Producer factor should be between 0 (Exclusive) and 1 (inclusive)")
+        self.assertEqual(str(e.exception), "Producer factor should be between 0 (Exclusive) and 2 (inclusive)")
 
     def test_get_data_shape(self):
         # check first year values