From b5c95fd058087776f564c9f817e78f2556b76d6d Mon Sep 17 00:00:00 2001 From: Kakodkar Date: Mon, 17 Nov 2025 16:49:49 -0600 Subject: [PATCH] version change --- CHANGELOG.md | 8 +++++ background.rst | 2 +- docs/conf.py | 2 +- .../troubleshooting/common_issues.rst | 2 +- pyproject.toml | 2 +- src/energia/__init__.py | 11 +++++-- src/energia/represent/model.py | 29 +++++++++---------- 7 files changed, 33 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 675b7431..728de82f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ All notable changes to this project will be documented here. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [2.1.6] - 2025-11-17 + +### Changed +- Read Me +- Using helper functions to simplify classes + + ## [2.1.5] - 2025-11-12 ### Changed diff --git a/background.rst b/background.rst index 2345e5c2..e9878701 100644 --- a/background.rst +++ b/background.rst @@ -10,7 +10,7 @@ domains. For more research on advancing computational methods in modeling and op see `Multiparameteric Optimization and Control (Pistikopoulos) Group `_. -Direct any queries regarding the implementation or theoretical background to Rahul Kakodkar (cacodcar@gmail.com). +Direct any queries regarding the implementation or theoretical background to `Rahul Kakodkar `_. .. seealso:: diff --git a/docs/conf.py b/docs/conf.py index 9f9aeab0..8b26c8d8 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -25,7 +25,7 @@ project = 'Energia' copyright = str(datetime.now().year) author = 'Rahul Kakodkar, Efstratios N. Pistikopoulos' -release = '2.1.5' +release = '2.1.6' html_logo = "_static/logo2.jpg" diff --git a/docs/tutorials/troubleshooting/common_issues.rst b/docs/tutorials/troubleshooting/common_issues.rst index 4a924b91..2a1b9a36 100644 --- a/docs/tutorials/troubleshooting/common_issues.rst +++ b/docs/tutorials/troubleshooting/common_issues.rst @@ -52,7 +52,7 @@ To check your Energia version, run: .. code-block:: console - 2.1.5 + 2.1.6 Older versions use *energiapy* as the package name. diff --git a/pyproject.toml b/pyproject.toml index 7e126e7b..61474df9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "energiapy" -version = "2.1.5" +version = "2.1.6" authors = [ { name="Rahul Kakodkar", email="cacodcar@gmail.com" }, {name = "Efstratios N. Pistikopoulos", email = "stratos@tamu.edu"} diff --git a/src/energia/__init__.py b/src/energia/__init__.py index be7f6a4e..c4454c07 100644 --- a/src/energia/__init__.py +++ b/src/energia/__init__.py @@ -15,8 +15,13 @@ from .components.spatial.location import Location from .components.temporal.periods import Periods from .components.temporal.scales import TemporalScales -from .library.components import (currencies, env_indicators, misc_units, - si_units, time_units) +from .library.components import ( + currencies, + env_indicators, + misc_units, + si_units, + time_units, +) from .represent.model import Model __all__ = [ @@ -44,4 +49,4 @@ "si_units", "time_units", ] -__version__ = "2.1.5" +__version__ = "2.1.6" diff --git a/src/energia/represent/model.py b/src/energia/represent/model.py index 37cf62fa..6880e570 100644 --- a/src/energia/represent/model.py +++ b/src/energia/represent/model.py @@ -18,6 +18,7 @@ from ..components.commodities.resource import Resource from ..components.game.couple import Interact from ..components.game.player import Player + # from ..components.graph.edge import Edge # from ..components.graph.node import Node from ..components.impact.categories import Economic, Environ, Social @@ -39,9 +40,17 @@ from ..dimensions.time import Time from ..library.aliases import aspect_aliases from ..library.instructions import costing_commodity, costing_operation -from ..library.recipes import (capacity_sizing, economic, environmental, - free_movement, inventory_sizing, operating, - social, trade, usage) +from ..library.recipes import ( + capacity_sizing, + economic, + environmental, + free_movement, + inventory_sizing, + operating, + social, + trade, + usage, +) from ..modeling.parameters.instruction import Instruction from ..modeling.variables.control import Control from ..modeling.variables.recipe import Recipe @@ -871,19 +880,7 @@ def solve( Solve the multiparametric program :param using: The solving method to use. Defaults to "combinatorial". - :type using: Literal[ - "combinatorial", - "combinatorial_parallel", - "combinatorial_parallel_exp", - "graph", - "graph_exp", - "graph_parallel", - "graph_parallel_exp", - "combinatorial_graph", - "geometric", - "geometric_parallel", - "geometric_parallel_exp", - ], optional + :type using: Literal """ self.program.solve(using=using)