Add unsaved changes and adjust github actions

.github/workflows/test.yml → .github/workflows/daily_tests.yml

@@ -1,4 +1,4 @@
-name: Run ETHOS.PeNALPS Tests
+name: Daily ETHOS.PeNALPS Tests
 on: 
   workflow_dispatch:
     inputs:
@@ -90,7 +90,7 @@ jobs:
           with:
             repository: FZJ-IEK3-VSA/ETHOS_PeNALPS
             path: './ETHOS_PENALPS'
-            ref: ${{ github.ref }}
+            ref: main
         - uses: conda-incubator/setup-miniconda@v3
           with:
             miniforge-version: latest

.github/workflows/push_and_pull_tests.yml

@@ -0,0 +1,80 @@
+name: Run ETHOS.PeNALPS Tests on push or pull
+on: 
+  workflow_dispatch:
+    inputs:
+      tags:
+        description: 'Manual run' 
+  push:
+    branches: 
+      - main
+      - dev
+  pull_request:
+    branches: 
+      - main
+      - dev
+  # Allows to trigger the workflow manually   
+
+
+jobs:    
+    TestPeNALPSDevLocal:
+      name: Ex1 (${{ matrix.python-version }}, ${{ matrix.os }})
+      runs-on: ${{ matrix.os }}
+      strategy:
+        fail-fast: false
+        matrix:
+          os: ["ubuntu-latest","ubuntu-20.04", "macos-latest","macos-13","macos-12", "macos-11","windows-latest","windows-2019"]
+      steps:
+        - name: Checkout
+          uses: actions/checkout@v4
+          with:
+            repository: FZJ-IEK3-VSA/ETHOS_PeNALPS
+            path: './ETHOS_PENALPS'
+            ref: ${{ github.ref }}
+        - uses: conda-incubator/setup-miniconda@v3
+          with:
+            miniforge-version: latest
+            channels: conda-forge
+            activate-environment: test_env
+        - name: Run tests
+          shell: pwsh
+          run: |
+            ls
+            echo "LS Done"
+            cd ETHOS_PENALPS
+            mamba env create --name penalps_env --yes --file environment.yml
+            conda run --name penalps_env pip install . --no-deps
+            echo "Installation done"
+            conda list --name penalps_env
+            echo "libaries printed"
+            echo "start pytest"
+            conda run --name penalps_env pytest
+            echo "Pytest done"
+            echo "run examples"
+        - name: Run examples
+          shell: pwsh
+          run: |
+            ls
+            cd ETHOS_PENALPS
+            cd examples
+            cd tutorial
+            conda run --name penalps_env python _1_cooking_example.py
+            conda run --name penalps_env python _2_cooking_example_more_states.py
+            conda run --name penalps_env python _3_add_more_cooker_for_parallel_operation.py
+            conda run --name penalps_env python _4_cooking_and_mixer_exclusive_example.py
+            cd _5_connect_four_process_steps
+            conda run --name penalps_env python simulation_starter.py
+            cd ..
+            cd ..
+            cd toffee_production
+            conda run --name penalps_env python simulation_starter.py
+            cd ..
+            cd basic_examples
+            conda run --name penalps_env python batch_to_batch_1_node_example.py
+            cd ..
+            cd b_pillar_manufacturing
+            conda run --name penalps_env python simulation_starter.py
+            echo "Running examples terminated"
+
+
+
+#"PENALPS_VERSION=$PENALPS_VERSION" >> $GITHUB_OUTPUT

README.md

@@ -1,6 +1,6 @@
 | Name | Version | Platforms | Daily Tests |
 |---|---|---|---|
-|[![Conda Recipe](https://img.shields.io/badge/recipe-ethos_penalps-green.svg)](https://anaconda.org/conda-forge/ethos_penalps)|[![Conda Version](https://img.shields.io/conda/vn/conda-forge/ethos_penalps.svg)](https://anaconda.org/conda-forge/ethos_penalps)|[![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/ethos_penalps.svg)](https://anaconda.org/conda-forge/ethos_penalps) |![example workflow](https://github.com/FZJ-IEK3-VSA/ETHOS_PeNALPS/actions/workflows/test.yml/badge.svg)
+|[![Conda Recipe](https://img.shields.io/badge/recipe-ethos_penalps-green.svg)](https://anaconda.org/conda-forge/ethos_penalps)|[![Conda Version](https://img.shields.io/conda/vn/conda-forge/ethos_penalps.svg)](https://anaconda.org/conda-forge/ethos_penalps)|[![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/ethos_penalps.svg)](https://anaconda.org/conda-forge/ethos_penalps) |![example workflow](https://github.com/FZJ-IEK3-VSA/ETHOS_PeNALPS/actions/workflows/daily_tests.yml/badge.svg)
 
 <a href="https://www.fz-juelich.de/en/iek/iek-3"><img src="https://github.com/FZJ-IEK3-VSA/README_assets/blob/main/FJZ_IEK-3_logo.svg?raw=True" alt="Forschungszentrum Juelich Logo" width="300px"></a> 
 # ETHOS.PeNALPS

examples/b_pillar_manufacturing/cutting_and_heating_chain.py

@@ -1,7 +1,7 @@
 import datetime
 
 from ethos_penalps.data_classes import Commodity, LoadType
-from ethos_penalps.process_chain import ProcessChain
+from ethos_penalps.organizational_agents.process_chain import ProcessChain
 from ethos_penalps.process_nodes.process_chain_storage import ProcessChainStorage
 from ethos_penalps.process_nodes.sink import Sink
 from ethos_penalps.process_nodes.source import Source

examples/b_pillar_manufacturing/forming_quenching_and_trimming_chain.py

@@ -1,7 +1,7 @@
 import datetime
 
 from ethos_penalps.data_classes import Commodity, LoadType
-from ethos_penalps.process_chain import ProcessChain
+from ethos_penalps.organizational_agents.process_chain import ProcessChain
 from ethos_penalps.process_nodes.process_chain_storage import ProcessChainStorage
 from ethos_penalps.process_nodes.sink import Sink
 from ethos_penalps.process_nodes.source import Source

examples/b_pillar_manufacturing/simulation_starter.py

@@ -7,7 +7,7 @@
 )
 
 from ethos_penalps.data_classes import Commodity
-from ethos_penalps.enterprise import Enterprise
+from ethos_penalps.organizational_agents.enterprise import Enterprise
 from ethos_penalps.order_generator import NOrderGenerator
 from ethos_penalps.time_data import TimeData
 from ethos_penalps.utilities.logger_ethos_penalps import PeNALPSLogger

examples/basic_examples/batch_to_batch_1_node_example.py

@@ -5,7 +5,7 @@
 install_import_hook("ethos_penalps")
 
 from ethos_penalps.data_classes import Commodity, LoadType
-from ethos_penalps.enterprise import Enterprise
+from ethos_penalps.organizational_agents.enterprise import Enterprise
 from ethos_penalps.order_generator import NOrderGenerator
 from ethos_penalps.stream import (
     BatchStreamStaticData,

examples/toffee_production/cutting_and_packaging_chain.py

@@ -1,7 +1,7 @@
 import datetime
 
 from ethos_penalps.data_classes import Commodity, LoadType
-from ethos_penalps.process_chain import ProcessChain
+from ethos_penalps.organizational_agents.process_chain import ProcessChain
 from ethos_penalps.process_nodes.process_chain_storage import ProcessChainStorage
 from ethos_penalps.process_nodes.sink import Sink
 from ethos_penalps.process_nodes.source import Source

examples/toffee_production/simulation_starter.py

@@ -3,7 +3,7 @@
 
 from cutting_and_packaging_chain import fill_cutting_and_packaging_chain
 from ethos_penalps.data_classes import Commodity, LoadType
-from ethos_penalps.enterprise import Enterprise
+from ethos_penalps.organizational_agents.enterprise import Enterprise
 from ethos_penalps.order_generator import NOrderGenerator
 from ethos_penalps.time_data import TimeData
 from ethos_penalps.utilities.logger_ethos_penalps import PeNALPSLogger

examples/toffee_production/toffee_preparation_chain_1.py

@@ -1,7 +1,7 @@
 import datetime
 
 from ethos_penalps.data_classes import LoadType
-from ethos_penalps.process_chain import ProcessChain
+from ethos_penalps.organizational_agents.process_chain import ProcessChain
 from ethos_penalps.process_nodes.process_chain_storage import ProcessChainStorage
 from ethos_penalps.process_nodes.sink import Sink
 from ethos_penalps.process_nodes.source import Source

examples/toffee_production/toffee_preparation_chain_2.py

@@ -1,7 +1,7 @@
 import datetime
 
 from ethos_penalps.data_classes import LoadType
-from ethos_penalps.process_chain import ProcessChain
+from ethos_penalps.organizational_agents.process_chain import ProcessChain
 from ethos_penalps.process_nodes.process_chain_storage import ProcessChainStorage
 from ethos_penalps.process_nodes.sink import Sink
 from ethos_penalps.process_nodes.source import Source

examples/tutorial/_1_cooking_example.py

@@ -5,7 +5,7 @@
 
 install_import_hook("ethos_penalps")
 from ethos_penalps.data_classes import Commodity, LoadType
-from ethos_penalps.enterprise import Enterprise
+from ethos_penalps.organizational_agents.enterprise import Enterprise
 from ethos_penalps.order_generator import NOrderGenerator
 from ethos_penalps.stream import BatchStreamStaticData, ContinuousStreamStaticData
 from ethos_penalps.time_data import TimeData

examples/tutorial/_2_cooking_example_more_states.py

@@ -2,7 +2,7 @@
 import logging
 
 from ethos_penalps.data_classes import Commodity, LoadType
-from ethos_penalps.enterprise import Enterprise
+from ethos_penalps.organizational_agents.enterprise import Enterprise
 from ethos_penalps.order_generator import NOrderGenerator
 from ethos_penalps.stream import BatchStreamStaticData, ContinuousStreamStaticData
 from ethos_penalps.time_data import TimeData

examples/tutorial/_3_add_more_cooker_for_parallel_operation.py

@@ -5,7 +5,7 @@
 
 install_import_hook("ethos_penalps")
 from ethos_penalps.data_classes import Commodity, LoadType
-from ethos_penalps.enterprise import Enterprise
+from ethos_penalps.organizational_agents.enterprise import Enterprise
 from ethos_penalps.order_generator import NOrderGenerator
 from ethos_penalps.stream import BatchStreamStaticData, ContinuousStreamStaticData
 from ethos_penalps.time_data import TimeData

examples/tutorial/_4_cooking_and_mixer_exclusive_example.py

@@ -2,7 +2,7 @@
 import logging
 
 from ethos_penalps.data_classes import Commodity, LoadType
-from ethos_penalps.enterprise import Enterprise
+from ethos_penalps.organizational_agents.enterprise import Enterprise
 from ethos_penalps.order_generator import NOrderGenerator
 from ethos_penalps.stream import BatchStreamStaticData, ContinuousStreamStaticData
 from ethos_penalps.time_data import TimeData

examples/tutorial/_5_connect_four_process_steps/blending_process_chain.py

@@ -2,12 +2,12 @@
 import logging
 
 from ethos_penalps.data_classes import Commodity, LoadType
-from ethos_penalps.enterprise import Enterprise
+from ethos_penalps.organizational_agents.enterprise import Enterprise
 from ethos_penalps.order_generator import NOrderGenerator
 from ethos_penalps.stream import BatchStreamStaticData, ContinuousStreamStaticData
 from ethos_penalps.time_data import TimeData
 from ethos_penalps.utilities.logger_ethos_penalps import PeNALPSLogger
-from ethos_penalps.process_chain import ProcessChain
+from ethos_penalps.organizational_agents.process_chain import ProcessChain
 from ethos_penalps.process_nodes.sink import Sink
 from ethos_penalps.process_nodes.source import Source
 from ethos_penalps.process_nodes.process_chain_storage import ProcessChainStorage

examples/tutorial/_5_connect_four_process_steps/cooking_process_chain.py

@@ -2,12 +2,12 @@
 import logging
 
 from ethos_penalps.data_classes import Commodity, LoadType
-from ethos_penalps.enterprise import Enterprise
+from ethos_penalps.organizational_agents.enterprise import Enterprise
 from ethos_penalps.order_generator import NOrderGenerator
 from ethos_penalps.stream import BatchStreamStaticData, ContinuousStreamStaticData
 from ethos_penalps.time_data import TimeData
 from ethos_penalps.utilities.logger_ethos_penalps import PeNALPSLogger
-from ethos_penalps.process_chain import ProcessChain
+from ethos_penalps.organizational_agents.process_chain import ProcessChain
 from ethos_penalps.process_nodes.sink import Sink
 from ethos_penalps.process_nodes.source import Source
 from ethos_penalps.process_nodes.process_chain_storage import ProcessChainStorage

examples/tutorial/_5_connect_four_process_steps/simulation_starter.py

@@ -2,7 +2,7 @@
 import logging
 
 from ethos_penalps.data_classes import Commodity, LoadType
-from ethos_penalps.enterprise import Enterprise
+from ethos_penalps.organizational_agents.enterprise import Enterprise
 from ethos_penalps.order_generator import NOrderGenerator
 from ethos_penalps.stream import BatchStreamStaticData, ContinuousStreamStaticData
 from ethos_penalps.time_data import TimeData

src/ethos_penalps/automatic_sizer/capacity_calculator.py

@@ -7,7 +7,7 @@
 import datetimerange
 import scipy.optimize
 
-from ethos_penalps.process_chain import ProcessChain
+from ethos_penalps.organizational_agents.process_chain import ProcessChain
 from ethos_penalps.process_nodes.process_step import ProcessStep
 from ethos_penalps.process_nodes.sink import Sink
 from ethos_penalps.process_nodes.source import Source

src/ethos_penalps/organizational_agents/enterprise.py

@@ -4,15 +4,15 @@
 import cloudpickle
 
 from ethos_penalps.load_profile_calculator import LoadProfileHandlerSimulation
-from ethos_penalps.network_level import NetworkLevel
+from ethos_penalps.organizational_agents.network_level import NetworkLevel
 from ethos_penalps.post_processing.report_generator.enterprise_report_generator import (
     EnterpriseReportGenerator,
 )
 from ethos_penalps.utilities.exceptions_and_warnings import MisconfigurationError
 from ethos_penalps.post_processing.report_generator.report_options import (
     standard_simulation_report,
 )
-from ethos_penalps.process_chain import ProcessChain
+from ethos_penalps.organizational_agents.process_chain import ProcessChain
 from ethos_penalps.process_nodes.process_chain_storage import ProcessChainStorage
 from ethos_penalps.process_nodes.process_node import ProcessNode
 from ethos_penalps.process_nodes.sink import Sink

src/ethos_penalps/organizational_agents/network_level.py

@@ -8,7 +8,7 @@
     get_new_uuid,
 )
 from ethos_penalps.load_profile_calculator import LoadProfileHandlerSimulation
-from ethos_penalps.process_chain import ProcessChain
+from ethos_penalps.organizational_agents.process_chain import ProcessChain
 from ethos_penalps.process_nodes.process_chain_storage import ProcessChainStorage
 from ethos_penalps.process_nodes.process_step import ProcessNode
 from ethos_penalps.process_nodes.sink import Sink

src/ethos_penalps/petri_net/process_state.py

@@ -15,7 +15,7 @@
     ProcessStateEnergyLoadData,
     ProcessStateEnergyLoadDataBasedOnStreamMass,
 )
-from ethos_penalps.process_state_switch import (
+from ethos_penalps.petri_net.process_state_switch import (
     ProcessStateSwitch,
     ProcessStateSwitchAfterInputAndOutputStream,
     ProcessStateSwitchAtInputStreamProvided,

src/ethos_penalps/petri_net/process_state_handler.py

@@ -5,7 +5,7 @@
     ProcessStateData,
     ProcessStepProductionPlanEntry,
 )
-from ethos_penalps.process_state import (
+from ethos_penalps.petri_net.process_state import (
     BatchInputStreamRequestingStateWithStorage,
     BatchInputStreamRequestingStateWithStorageEnergyBasedOnStream,
     BatchOutputStreamProvidingState,
@@ -22,8 +22,8 @@
     ProcessStateIdle,
     ProcessStateParallelContinuousInputWithStorage,
 )
-from ethos_penalps.process_state_switch import ProcessStateSwitch
-from ethos_penalps.process_state_switch_selector import (
+from ethos_penalps.petri_net.process_state_switch import ProcessStateSwitch
+from ethos_penalps.petri_net.process_state_switch_selector import (
     MultiTargetSelector,
     ProcessStateSwitchSelectorHandler,
 )

src/ethos_penalps/petri_net/process_state_network_navigator.py

@@ -3,7 +3,7 @@
 
 from ethos_penalps.data_classes import TemporalBranchIdentifier
 from ethos_penalps.mass_balance import MassBalance
-from ethos_penalps.process_state import (
+from ethos_penalps.petri_net.process_state import (
     BatchInputStreamRequestingStateWithStorage,
     BatchInputStreamRequestingStateWithStorageEnergyBasedOnStream,
     FullBatchInputStreamProvidingState,
@@ -13,7 +13,7 @@
     OutputStreamProvidingState,
     ProcessStateParallelContinuousInputWithStorage,
 )
-from ethos_penalps.process_state_handler import ProcessStateHandler
+from ethos_penalps.petri_net.process_state_handler import ProcessStateHandler
 from ethos_penalps.production_plan import OutputBranchProductionPlan, ProductionPlan
 from ethos_penalps.simulation_data.container_simulation_data import (
     OutputBranchData,

src/ethos_penalps/petri_net/process_state_switch_selector.py

@@ -2,8 +2,11 @@
 from abc import ABC, abstractmethod
 
 from ethos_penalps.data_classes import StateConnector
-from ethos_penalps.process_state import ProcessState, ProcessStateSwitchHandler
-from ethos_penalps.process_state_switch import (
+from ethos_penalps.petri_net.process_state import (
+    ProcessState,
+    ProcessStateSwitchHandler,
+)
+from ethos_penalps.petri_net.process_state_switch import (
     ProcessStateSwitch,
     ProcessStateSwitchAtInputStreamProvided,
     ProcessStateSwitchAtNextDiscreteEvent,

src/ethos_penalps/post_processing/enterprise_graph_for_failed_run.py

@@ -12,7 +12,7 @@
 from ethos_penalps.process_nodes.sink import Sink
 from ethos_penalps.process_nodes.source import Source
 from ethos_penalps.utilities.logger_ethos_penalps import PeNALPSLogger
-from ethos_penalps.process_state import ProcessState
+from ethos_penalps.petri_net.process_state import ProcessState
 from ethos_penalps.stream import ContinuousStream, BatchStream
 from ethos_penalps.stream_handler import StreamHandler
 from ethos_penalps.data_classes import StateConnector

src/ethos_penalps/post_processing/network_analyzer.py

@@ -9,12 +9,12 @@
     StorageDataFrameMetaInformation,
 )
 from ethos_penalps.load_profile_calculator import LoadProfileHandlerSimulation
-from ethos_penalps.network_level import NetworkLevel
+from ethos_penalps.organizational_agents.network_level import NetworkLevel
 from ethos_penalps.order_generator import OrderCollection
 from ethos_penalps.post_processing.time_series_visualizations.order_plot import (
     post_process_order_collection,
 )
-from ethos_penalps.process_chain import ProcessChain
+from ethos_penalps.organizational_agents.process_chain import ProcessChain
 from ethos_penalps.process_nodes.process_chain_storage import ProcessChainStorage
 from ethos_penalps.process_nodes.process_step import ProcessStep
 from ethos_penalps.process_nodes.sink import Sink, Source

src/ethos_penalps/post_processing/report_generator/enterprise_report_generator.py

@@ -11,7 +11,7 @@
 
 from ethos_penalps.data_classes import CurrentProcessNode, LoopCounter
 from ethos_penalps.load_profile_calculator import LoadProfileHandlerSimulation, LoadType
-from ethos_penalps.network_level import NetworkLevel
+from ethos_penalps.organizational_agents.network_level import NetworkLevel
 from ethos_penalps.node_operations import ProductionOrder
 from ethos_penalps.post_processing.network_analyzer import (
     NetworkAnalyzer,

src/ethos_penalps/post_processing/report_generator/process_overview_page.py

@@ -3,7 +3,7 @@
 import datapane
 import pandas
 
-from ethos_penalps.network_level import NetworkLevel
+from ethos_penalps.organizational_agents.network_level import NetworkLevel
 from ethos_penalps.post_processing.network_analyzer import ResultSelector
 from ethos_penalps.post_processing.report_generator.report_options import (
     ReportGeneratorOptions,