Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion background.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ domains. For more research on advancing computational methods in modeling and op
see `Multiparameteric Optimization and Control (Pistikopoulos) Group <https://parametric.tamu.edu>`_.


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 <http://www.cacodcar.com>`_.


.. seealso::
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/troubleshooting/common_issues.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
11 changes: 8 additions & 3 deletions src/energia/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__ = [
Expand Down Expand Up @@ -44,4 +49,4 @@
"si_units",
"time_units",
]
__version__ = "2.1.5"
__version__ = "2.1.6"
29 changes: 13 additions & 16 deletions src/energia/represent/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down