diff --git a/.github/workflows/test.yml b/.github/workflows/daily_tests.yml similarity index 97% rename from .github/workflows/test.yml rename to .github/workflows/daily_tests.yml index 7ecfa76..01aa026 100644 --- a/.github/workflows/test.yml +++ b/.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 diff --git a/.github/workflows/push_and_pull_tests.yml b/.github/workflows/push_and_pull_tests.yml new file mode 100644 index 0000000..b9dfd1d --- /dev/null +++ b/.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 \ No newline at end of file diff --git a/README.md b/README.md index cb538d2..c616f3a 100644 --- a/README.md +++ b/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) Forschungszentrum Juelich Logo # ETHOS.PeNALPS diff --git a/examples/b_pillar_manufacturing/cutting_and_heating_chain.py b/examples/b_pillar_manufacturing/cutting_and_heating_chain.py index acfe562..2aed380 100644 --- a/examples/b_pillar_manufacturing/cutting_and_heating_chain.py +++ b/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 diff --git a/examples/b_pillar_manufacturing/forming_quenching_and_trimming_chain.py b/examples/b_pillar_manufacturing/forming_quenching_and_trimming_chain.py index 0bbc9ab..0f5a095 100644 --- a/examples/b_pillar_manufacturing/forming_quenching_and_trimming_chain.py +++ b/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 diff --git a/examples/b_pillar_manufacturing/simulation_starter.py b/examples/b_pillar_manufacturing/simulation_starter.py index 328ebb1..be0d167 100644 --- a/examples/b_pillar_manufacturing/simulation_starter.py +++ b/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 diff --git a/examples/basic_examples/batch_to_batch_1_node_example.py b/examples/basic_examples/batch_to_batch_1_node_example.py index 32c3e66..d10ba77 100644 --- a/examples/basic_examples/batch_to_batch_1_node_example.py +++ b/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, diff --git a/examples/toffee_production/cutting_and_packaging_chain.py b/examples/toffee_production/cutting_and_packaging_chain.py index 9bedd13..f6787ac 100644 --- a/examples/toffee_production/cutting_and_packaging_chain.py +++ b/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 diff --git a/examples/toffee_production/simulation_starter.py b/examples/toffee_production/simulation_starter.py index faaf8b6..422457d 100644 --- a/examples/toffee_production/simulation_starter.py +++ b/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 diff --git a/examples/toffee_production/toffee_preparation_chain_1.py b/examples/toffee_production/toffee_preparation_chain_1.py index 4ff9ab9..89d5239 100644 --- a/examples/toffee_production/toffee_preparation_chain_1.py +++ b/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 diff --git a/examples/toffee_production/toffee_preparation_chain_2.py b/examples/toffee_production/toffee_preparation_chain_2.py index 7913859..1c3e940 100644 --- a/examples/toffee_production/toffee_preparation_chain_2.py +++ b/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 diff --git a/examples/tutorial/_1_cooking_example.py b/examples/tutorial/_1_cooking_example.py index 5c768d9..aadf865 100644 --- a/examples/tutorial/_1_cooking_example.py +++ b/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 diff --git a/examples/tutorial/_2_cooking_example_more_states.py b/examples/tutorial/_2_cooking_example_more_states.py index 839f269..8ca4afe 100644 --- a/examples/tutorial/_2_cooking_example_more_states.py +++ b/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 diff --git a/examples/tutorial/_3_add_more_cooker_for_parallel_operation.py b/examples/tutorial/_3_add_more_cooker_for_parallel_operation.py index 900a6d9..32170ec 100644 --- a/examples/tutorial/_3_add_more_cooker_for_parallel_operation.py +++ b/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 diff --git a/examples/tutorial/_4_cooking_and_mixer_exclusive_example.py b/examples/tutorial/_4_cooking_and_mixer_exclusive_example.py index 299d98f..6233def 100644 --- a/examples/tutorial/_4_cooking_and_mixer_exclusive_example.py +++ b/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 diff --git a/examples/tutorial/_5_connect_four_process_steps/blending_process_chain.py b/examples/tutorial/_5_connect_four_process_steps/blending_process_chain.py index 3d05c0f..e916f8d 100644 --- a/examples/tutorial/_5_connect_four_process_steps/blending_process_chain.py +++ b/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 diff --git a/examples/tutorial/_5_connect_four_process_steps/cooking_process_chain.py b/examples/tutorial/_5_connect_four_process_steps/cooking_process_chain.py index de8a6f5..e003070 100644 --- a/examples/tutorial/_5_connect_four_process_steps/cooking_process_chain.py +++ b/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 diff --git a/examples/tutorial/_5_connect_four_process_steps/simulation_starter.py b/examples/tutorial/_5_connect_four_process_steps/simulation_starter.py index 0001144..93ac8ae 100644 --- a/examples/tutorial/_5_connect_four_process_steps/simulation_starter.py +++ b/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 diff --git a/src/ethos_penalps/automatic_sizer/capacity_calculator.py b/src/ethos_penalps/automatic_sizer/capacity_calculator.py index b6fd931..258f9ce 100644 --- a/src/ethos_penalps/automatic_sizer/capacity_calculator.py +++ b/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 diff --git a/src/ethos_penalps/organizational_agents/enterprise.py b/src/ethos_penalps/organizational_agents/enterprise.py index 2082238..7ae1c01 100644 --- a/src/ethos_penalps/organizational_agents/enterprise.py +++ b/src/ethos_penalps/organizational_agents/enterprise.py @@ -4,7 +4,7 @@ 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, ) @@ -12,7 +12,7 @@ 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 diff --git a/src/ethos_penalps/organizational_agents/network_level.py b/src/ethos_penalps/organizational_agents/network_level.py index ddc7f04..2a82d90 100644 --- a/src/ethos_penalps/organizational_agents/network_level.py +++ b/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 diff --git a/src/ethos_penalps/petri_net/process_state.py b/src/ethos_penalps/petri_net/process_state.py index 9a575ae..c04044e 100644 --- a/src/ethos_penalps/petri_net/process_state.py +++ b/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, diff --git a/src/ethos_penalps/petri_net/process_state_handler.py b/src/ethos_penalps/petri_net/process_state_handler.py index 9ebc7d1..59a9778 100644 --- a/src/ethos_penalps/petri_net/process_state_handler.py +++ b/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, ) diff --git a/src/ethos_penalps/petri_net/process_state_network_navigator.py b/src/ethos_penalps/petri_net/process_state_network_navigator.py index 1906e7e..7aec2ba 100644 --- a/src/ethos_penalps/petri_net/process_state_network_navigator.py +++ b/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, diff --git a/src/ethos_penalps/petri_net/process_state_switch_selector.py b/src/ethos_penalps/petri_net/process_state_switch_selector.py index 7dbe531..49688b5 100644 --- a/src/ethos_penalps/petri_net/process_state_switch_selector.py +++ b/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, diff --git a/src/ethos_penalps/post_processing/enterprise_graph_for_failed_run.py b/src/ethos_penalps/post_processing/enterprise_graph_for_failed_run.py index 44ba6b7..55c23c5 100644 --- a/src/ethos_penalps/post_processing/enterprise_graph_for_failed_run.py +++ b/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 diff --git a/src/ethos_penalps/post_processing/network_analyzer.py b/src/ethos_penalps/post_processing/network_analyzer.py index 2ff55e8..14ebfa9 100644 --- a/src/ethos_penalps/post_processing/network_analyzer.py +++ b/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 diff --git a/src/ethos_penalps/post_processing/report_generator/enterprise_report_generator.py b/src/ethos_penalps/post_processing/report_generator/enterprise_report_generator.py index 3f7e7f3..a00c001 100644 --- a/src/ethos_penalps/post_processing/report_generator/enterprise_report_generator.py +++ b/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, diff --git a/src/ethos_penalps/post_processing/report_generator/process_overview_page.py b/src/ethos_penalps/post_processing/report_generator/process_overview_page.py index f364b6b..174def9 100644 --- a/src/ethos_penalps/post_processing/report_generator/process_overview_page.py +++ b/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, diff --git a/src/ethos_penalps/post_processing/tikz_visualizations/enterprise_graph_builder.py b/src/ethos_penalps/post_processing/tikz_visualizations/enterprise_graph_builder.py index 06ec378..6c289d2 100644 --- a/src/ethos_penalps/post_processing/tikz_visualizations/enterprise_graph_builder.py +++ b/src/ethos_penalps/post_processing/tikz_visualizations/enterprise_graph_builder.py @@ -14,7 +14,7 @@ PDFSyntaxError, ) -from ethos_penalps.network_level import NetworkLevel +from ethos_penalps.organizational_agents.network_level import NetworkLevel from ethos_penalps.post_processing.tikz_visualizations.tikz_wrapper import ( BackwardEdge, ForwardEdge, @@ -26,13 +26,13 @@ TikzNode, TikzRelativePositions, ) -from ethos_penalps.process_chain import ProcessChain +from ethos_penalps.organizational_agents.process_chain import ProcessChain from ethos_penalps.process_nodes.process_node import ProcessNode 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 -from ethos_penalps.process_state_handler import ProcessStateHandler -from ethos_penalps.process_state_switch_selector import ( +from ethos_penalps.petri_net.process_state_handler import ProcessStateHandler +from ethos_penalps.petri_net.process_state_switch_selector import ( BatchStateSwitchSelector, ProcessStateSwitchSelector, ProvideOutputFromStorageSwitchSelector, diff --git a/src/ethos_penalps/post_processing/tikz_visualizations/process_chain_graph_builder.py b/src/ethos_penalps/post_processing/tikz_visualizations/process_chain_graph_builder.py index 45f932b..60fe52b 100644 --- a/src/ethos_penalps/post_processing/tikz_visualizations/process_chain_graph_builder.py +++ b/src/ethos_penalps/post_processing/tikz_visualizations/process_chain_graph_builder.py @@ -12,8 +12,8 @@ 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 -from ethos_penalps.process_state_handler import ProcessStateHandler -from ethos_penalps.process_state_switch_selector import ( +from ethos_penalps.petri_net.process_state_handler import ProcessStateHandler +from ethos_penalps.petri_net.process_state_switch_selector import ( BatchStateSwitchSelector, ProcessStateSwitchSelector, ProvideOutputFromStorageSwitchSelector, diff --git a/src/ethos_penalps/process_node_communicator.py b/src/ethos_penalps/process_node_communicator.py index 0102fdb..42358e4 100644 --- a/src/ethos_penalps/process_node_communicator.py +++ b/src/ethos_penalps/process_node_communicator.py @@ -15,9 +15,9 @@ UpstreamAdaptionOrder, UpstreamNewProductionOrder, ) -from ethos_penalps.process_state import OutputStreamProvidingState -from ethos_penalps.process_state_handler import ProcessStateHandler -from ethos_penalps.process_state_network_navigator import ( +from ethos_penalps.petri_net.process_state import OutputStreamProvidingState +from ethos_penalps.petri_net.process_state_handler import ProcessStateHandler +from ethos_penalps.petri_net.process_state_network_navigator import ( OutputStreamAdaptionDecider, ProcessStateNetworkNavigator, ) diff --git a/src/ethos_penalps/process_nodes/process_node.py b/src/ethos_penalps/process_nodes/process_node.py index 342daa0..41bd000 100644 --- a/src/ethos_penalps/process_nodes/process_node.py +++ b/src/ethos_penalps/process_nodes/process_node.py @@ -23,7 +23,7 @@ EmptyProductionBranch, ProcessNodeCommunicator, ) -from ethos_penalps.process_state_handler import ProcessStateHandler +from ethos_penalps.petri_net.process_state_handler import ProcessStateHandler from ethos_penalps.process_step_data import ProcessStepData from ethos_penalps.production_plan import ProductionPlan from ethos_penalps.simulation_data.simulation_data_branch import ( diff --git a/src/ethos_penalps/process_nodes/process_step.py b/src/ethos_penalps/process_nodes/process_step.py index 45b316a..220651c 100644 --- a/src/ethos_penalps/process_nodes/process_step.py +++ b/src/ethos_penalps/process_nodes/process_step.py @@ -25,7 +25,7 @@ ProcessNodeCommunicator, ) from ethos_penalps.process_nodes.process_node import ProcessNode -from ethos_penalps.process_state_handler import ProcessStateHandler +from ethos_penalps.petri_net.process_state_handler import ProcessStateHandler from ethos_penalps.process_step_data import ProcessStepData from ethos_penalps.production_plan import ProductionPlan from ethos_penalps.simulation_data.simulation_data_branch import ( diff --git a/src/ethos_penalps/process_nodes/sink.py b/src/ethos_penalps/process_nodes/sink.py index f08d1b6..7b51496 100644 --- a/src/ethos_penalps/process_nodes/sink.py +++ b/src/ethos_penalps/process_nodes/sink.py @@ -23,7 +23,7 @@ from ethos_penalps.process_node_communicator import EmptyProductionBranch from ethos_penalps.process_nodes.process_node import ProcessNode from ethos_penalps.process_nodes.source import Source -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.simulation_data_branch import ( CompleteOutputBranchData, diff --git a/test/production_plan_tests/cutting_and_heating_chain.py b/test/production_plan_tests/cutting_and_heating_chain.py index 086614e..9774674 100644 --- a/test/production_plan_tests/cutting_and_heating_chain.py +++ b/test/production_plan_tests/cutting_and_heating_chain.py @@ -2,14 +2,14 @@ from ethos_penalps.data_classes import Commodity, LoadProfileEntry, LoadType from ethos_penalps.utilities.debugging_information import NodeOperationViewer -from ethos_penalps.enterprise import Enterprise +from ethos_penalps.organizational_agents.enterprise import Enterprise from ethos_penalps.post_processing.enterprise_graph_for_failed_run import ( GraphVisualization, ) from ethos_penalps.post_processing.report_generator.process_chain_report_generator import ( ResultPathGenerator, ) -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 diff --git a/test/production_plan_tests/forming_quenching_and_trimming_chain.py b/test/production_plan_tests/forming_quenching_and_trimming_chain.py index 9e5720f..c90bfdd 100644 --- a/test/production_plan_tests/forming_quenching_and_trimming_chain.py +++ b/test/production_plan_tests/forming_quenching_and_trimming_chain.py @@ -2,7 +2,7 @@ from ethos_penalps.data_classes import Commodity, LoadProfileEntry, LoadType from ethos_penalps.utilities.debugging_information import NodeOperationViewer -from ethos_penalps.enterprise import Enterprise +from ethos_penalps.organizational_agents.enterprise import Enterprise from ethos_penalps.post_processing.enterprise_graph_for_failed_run import ( GraphVisualization, @@ -10,7 +10,7 @@ from ethos_penalps.post_processing.report_generator.process_chain_report_generator import ( ResultPathGenerator, ) -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 diff --git a/test/production_plan_tests/test_writing_to_production_plan.py b/test/production_plan_tests/test_writing_to_production_plan.py index 82e23af..6aaa796 100644 --- a/test/production_plan_tests/test_writing_to_production_plan.py +++ b/test/production_plan_tests/test_writing_to_production_plan.py @@ -9,9 +9,12 @@ ) import pytest -from ethos_penalps.capacity_calculator import CapacityAdjuster, CapacityCalculator +from ethos_penalps.automatic_sizer.capacity_calculator import ( + CapacityAdjuster, + CapacityCalculator, +) from ethos_penalps.data_classes import Commodity -from ethos_penalps.enterprise import Enterprise, NetworkLevel +from ethos_penalps.organizational_agents.enterprise import Enterprise, NetworkLevel from ethos_penalps.order_generator import NOrderGenerator from ethos_penalps.time_data import TimeData from ethos_penalps.utilities.general_functions import ResultPathGenerator diff --git a/test/test_b_pillar/cutting_and_heating_chain.py b/test/test_b_pillar/cutting_and_heating_chain.py index c3cca64..049510e 100644 --- a/test/test_b_pillar/cutting_and_heating_chain.py +++ b/test/test_b_pillar/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 diff --git a/test/test_b_pillar/forming_quenching_and_trimming_chain.py b/test/test_b_pillar/forming_quenching_and_trimming_chain.py index 0bbc9ab..0f5a095 100644 --- a/test/test_b_pillar/forming_quenching_and_trimming_chain.py +++ b/test/test_b_pillar/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 diff --git a/test/test_b_pillar/test_b_pillar.py b/test/test_b_pillar/test_b_pillar.py index 86ff3a5..fb53c3f 100644 --- a/test/test_b_pillar/test_b_pillar.py +++ b/test/test_b_pillar/test_b_pillar.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 diff --git a/test/test_production_plan_post_processor/cutting_and_heating_chain.py b/test/test_production_plan_post_processor/cutting_and_heating_chain.py index 60b4e7e..1e517bb 100644 --- a/test/test_production_plan_post_processor/cutting_and_heating_chain.py +++ b/test/test_production_plan_post_processor/cutting_and_heating_chain.py @@ -2,9 +2,9 @@ from ethos_penalps.data_classes import Commodity, LoadProfileEntry, LoadType from ethos_penalps.utilities.debugging_information import NodeOperationViewer -from ethos_penalps.enterprise import Enterprise +from ethos_penalps.organizational_agents.enterprise import Enterprise -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 diff --git a/test/test_production_plan_post_processor/forming_quenching_and_triming_chain.py b/test/test_production_plan_post_processor/forming_quenching_and_triming_chain.py index 9e5720f..c90bfdd 100644 --- a/test/test_production_plan_post_processor/forming_quenching_and_triming_chain.py +++ b/test/test_production_plan_post_processor/forming_quenching_and_triming_chain.py @@ -2,7 +2,7 @@ from ethos_penalps.data_classes import Commodity, LoadProfileEntry, LoadType from ethos_penalps.utilities.debugging_information import NodeOperationViewer -from ethos_penalps.enterprise import Enterprise +from ethos_penalps.organizational_agents.enterprise import Enterprise from ethos_penalps.post_processing.enterprise_graph_for_failed_run import ( GraphVisualization, @@ -10,7 +10,7 @@ from ethos_penalps.post_processing.report_generator.process_chain_report_generator import ( ResultPathGenerator, ) -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 diff --git a/test/test_production_plan_post_processor/test_process_step_post_processor.py b/test/test_production_plan_post_processor/test_process_step_post_processor.py index 3fb8a18..83bd513 100644 --- a/test/test_production_plan_post_processor/test_process_step_post_processor.py +++ b/test/test_production_plan_post_processor/test_process_step_post_processor.py @@ -7,9 +7,12 @@ fill_forming_quenching_and_trimming_chain, ) -from ethos_penalps.capacity_calculator import CapacityAdjuster, CapacityCalculator +from ethos_penalps.automatic_sizer.capacity_calculator import ( + CapacityAdjuster, + CapacityCalculator, +) from ethos_penalps.data_classes import Commodity -from ethos_penalps.enterprise import Enterprise, NetworkLevel +from ethos_penalps.organizational_agents.enterprise import Enterprise, NetworkLevel from ethos_penalps.order_generator import NOrderGenerator from ethos_penalps.time_data import TimeData from ethos_penalps.utilities.general_functions import ResultPathGenerator diff --git a/test/test_toffee_production/cutting_and_packaging_chain.py b/test/test_toffee_production/cutting_and_packaging_chain.py index 9bedd13..f6787ac 100644 --- a/test/test_toffee_production/cutting_and_packaging_chain.py +++ b/test/test_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 diff --git a/test/test_toffee_production/test_toffee_production.py b/test/test_toffee_production/test_toffee_production.py index a217f8a..630dca4 100644 --- a/test/test_toffee_production/test_toffee_production.py +++ b/test/test_toffee_production/test_toffee_production.py @@ -12,7 +12,7 @@ ) 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 diff --git a/test/test_toffee_production/toffee_preparation_chain_1.py b/test/test_toffee_production/toffee_preparation_chain_1.py index 5eb092a..4c97196 100644 --- a/test/test_toffee_production/toffee_preparation_chain_1.py +++ b/test/test_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.sink import Sink from ethos_penalps.process_nodes.source import Source from ethos_penalps.stream import BatchStreamStaticData, ContinuousStreamStaticData diff --git a/test/test_toffee_production/toffee_preparation_chain_2.py b/test/test_toffee_production/toffee_preparation_chain_2.py index 7931416..c3e7320 100644 --- a/test/test_toffee_production/toffee_preparation_chain_2.py +++ b/test/test_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.sink import Sink from ethos_penalps.process_nodes.source import Source from ethos_penalps.stream import BatchStreamStaticData, ContinuousStreamStaticData