flixopt 2.1.2__py3-none-any.whl → 2.1.4__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of flixopt might be problematic. Click here for more details.
- flixopt/core.py +6 -2
- flixopt/effects.py +1 -1
- {flixopt-2.1.2.dist-info → flixopt-2.1.4.dist-info}/METADATA +1 -1
- {flixopt-2.1.2.dist-info → flixopt-2.1.4.dist-info}/RECORD +7 -7
- {flixopt-2.1.2.dist-info → flixopt-2.1.4.dist-info}/WHEEL +0 -0
- {flixopt-2.1.2.dist-info → flixopt-2.1.4.dist-info}/licenses/LICENSE +0 -0
- {flixopt-2.1.2.dist-info → flixopt-2.1.4.dist-info}/top_level.txt +0 -0
flixopt/core.py
CHANGED
|
@@ -62,13 +62,17 @@ class DataConverter:
|
|
|
62
62
|
return xr.DataArray(data, coords=coords, dims=dims)
|
|
63
63
|
elif isinstance(data, pd.DataFrame):
|
|
64
64
|
if not data.index.equals(timesteps):
|
|
65
|
-
raise ConversionError("DataFrame index doesn't match timesteps index"
|
|
65
|
+
raise ConversionError(f"DataFrame index doesn't match timesteps index. "
|
|
66
|
+
f"Its missing the following time steps: {timesteps.difference(data.index)}. "
|
|
67
|
+
f"Some parameters might need an extra timestep at the end.")
|
|
66
68
|
if not len(data.columns) == 1:
|
|
67
69
|
raise ConversionError('DataFrame must have exactly one column')
|
|
68
70
|
return xr.DataArray(data.values.flatten(), coords=coords, dims=dims)
|
|
69
71
|
elif isinstance(data, pd.Series):
|
|
70
72
|
if not data.index.equals(timesteps):
|
|
71
|
-
raise ConversionError("Series index doesn't match timesteps index"
|
|
73
|
+
raise ConversionError(f"Series index doesn't match timesteps index. "
|
|
74
|
+
f"Its missing the following time steps: {timesteps.difference(data.index)}. "
|
|
75
|
+
f"Some parameters might need an extra timestep at the end.")
|
|
72
76
|
return xr.DataArray(data.values, coords=coords, dims=dims)
|
|
73
77
|
elif isinstance(data, np.ndarray):
|
|
74
78
|
if data.ndim != 1:
|
flixopt/effects.py
CHANGED
|
@@ -94,7 +94,7 @@ class Effect(Element):
|
|
|
94
94
|
f'{self.label_full}|minimum_operation_per_hour', self.minimum_operation_per_hour
|
|
95
95
|
)
|
|
96
96
|
self.maximum_operation_per_hour = flow_system.create_time_series(
|
|
97
|
-
f'{self.label_full}|maximum_operation_per_hour', self.maximum_operation_per_hour,
|
|
97
|
+
f'{self.label_full}|maximum_operation_per_hour', self.maximum_operation_per_hour,
|
|
98
98
|
)
|
|
99
99
|
|
|
100
100
|
self.specific_share_to_other_effects_operation = flow_system.create_effect_time_series(
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: flixopt
|
|
3
|
-
Version: 2.1.
|
|
3
|
+
Version: 2.1.4
|
|
4
4
|
Summary: Vector based energy and material flow optimization framework in Python.
|
|
5
5
|
Author-email: "Chair of Building Energy Systems and Heat Supply, TU Dresden" <peter.stange@tu-dresden.de>, Felix Bumann <felixbumann387@gmail.com>, Felix Panitz <baumbude@googlemail.com>, Peter Stange <peter.stange@tu-dresden.de>
|
|
6
6
|
Maintainer-email: Felix Bumann <felixbumann387@gmail.com>, Peter Stange <peter.stange@tu-dresden.de>
|
|
@@ -25,8 +25,8 @@ flixopt/commons.py,sha256=ZNlUN1z-h9OGHPo-s-n5OLlJaoPZKVGcAdRyGKpMk4M,1256
|
|
|
25
25
|
flixopt/components.py,sha256=7vI0IzWBLj81IErPllWHbMMqrrPlplYOPcH3aHvDbeY,29124
|
|
26
26
|
flixopt/config.py,sha256=Kt8QYk7hX5qHcQUtfgjM862C6SQr4K2lDvtk_LLER8Y,9085
|
|
27
27
|
flixopt/config.yaml,sha256=imzAnnhcJhIfKNTTXFB5Td7Pvk5ARn5j720k-oGGRug,392
|
|
28
|
-
flixopt/core.py,sha256=
|
|
29
|
-
flixopt/effects.py,sha256=
|
|
28
|
+
flixopt/core.py,sha256=dBdAzA3khIe64aVGpPj3G5PzOr7RdGdSymnV3xWgaR8,38083
|
|
29
|
+
flixopt/effects.py,sha256=TKpUfUo0wbX5y5HS9U8HcDNOiygg0R7k9V3TM0G6uL4,16650
|
|
30
30
|
flixopt/elements.py,sha256=9P2uB3twwADf48Gx1xCluE-ZJCkzw0X7tYrtKEQOjk8,26932
|
|
31
31
|
flixopt/features.py,sha256=sEtdj7BpaYS9a0XdhRUtdDFXWLdaGABRXdi5JOoLPb0,43919
|
|
32
32
|
flixopt/flow_system.py,sha256=4D2u2ucLig0GbC7ksCuWXuZPZdkgDzPafv-GhjAxRyk,17479
|
|
@@ -38,7 +38,7 @@ flixopt/results.py,sha256=GKSZmz0GCuJwspTC8Ot6MOKinvy_mhnDXCafb_f7uVY,35161
|
|
|
38
38
|
flixopt/solvers.py,sha256=k1bSoiXec3asWED70-erXkgtpn2C8KRBfSZj0FLviSM,2436
|
|
39
39
|
flixopt/structure.py,sha256=QS0IFBHzdEMKYTgd6uosudhoDD4X0JcdF7LlS-XRacs,26295
|
|
40
40
|
flixopt/utils.py,sha256=f-_vFDvvG27-c_VMpzkv3lb79Yny4rvoSmemushbzhU,1687
|
|
41
|
-
flixopt-2.1.
|
|
41
|
+
flixopt-2.1.4.dist-info/licenses/LICENSE,sha256=HKsZnbrM_3Rvnr_u9cWSG90cBsj5_slaqI_z_qcxnGI,1118
|
|
42
42
|
pics/architecture_flixOpt-pre2.0.0.png,sha256=9RWSA3vys588aadr2437zor-_-xBTQNQ0bAf8xGcu5g,70605
|
|
43
43
|
pics/architecture_flixOpt.png,sha256=KjN1bJwESbkHmTW7UsJ7dZyiKZlTO7Dx20dg8KlR1HU,260219
|
|
44
44
|
pics/flixOpt_plotting.jpg,sha256=zn7ZPAtXm5eRTxtOj86e4-PPhHpCar1jqGh7vMBgQGY,518862
|
|
@@ -47,7 +47,7 @@ pics/pics.pptx,sha256=ImWeGGvjtWJ6BGruipsnZYmWtHj5sWdbw1NSFePbkC8,683344
|
|
|
47
47
|
scripts/extract_release_notes.py,sha256=0v8B9c6VXz55PJ0I08W7FdxGp7jEY5NOkrqMY6MNdYU,1249
|
|
48
48
|
scripts/gen_ref_pages.py,sha256=AYRtXyz78x5I_Hn0oRtGVbTxgLLj2QNyRX6vWRefPjc,1960
|
|
49
49
|
tests/ressources/Zeitreihen2020.csv,sha256=kbsDTKZS0iUsNZAS7m3DohzZI_OHHWe44s3GwLvcTLw,1918412
|
|
50
|
-
flixopt-2.1.
|
|
51
|
-
flixopt-2.1.
|
|
52
|
-
flixopt-2.1.
|
|
53
|
-
flixopt-2.1.
|
|
50
|
+
flixopt-2.1.4.dist-info/METADATA,sha256=48o6Nah3Lr1g2NSvKWQmJbAWpMgrxMEYjTMG_smnYIU,7343
|
|
51
|
+
flixopt-2.1.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
52
|
+
flixopt-2.1.4.dist-info/top_level.txt,sha256=DEuo4R1z7GmEp5R3pjbQEJbaPRjKHFvNX2ceiBnVOL0,32
|
|
53
|
+
flixopt-2.1.4.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|