Skip to content

Commit 7e083cd

Browse files
eikeeike
committed
Continue refactor
1 parent 0f7159d commit 7e083cd

56 files changed

Lines changed: 883 additions & 773 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cosima_core/messages/message_pb2.py‎

Lines changed: 0 additions & 711 deletions
This file was deleted.

‎mosaik/.python-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.12

cosima_core/__init__.py renamed to mosaik/README.md

cosima_core/messages/__init__.py renamed to mosaik/__init__.py

File renamed without changes.

‎mosaik/pyproject.toml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
[project]
2+
name = "cosima"
3+
version = "0.4.0"
4+
description = "COmmunication SIMulation with Agents"
5+
readme = "README.md"
6+
authors = [{ name = "Cosima Team", email = "emilie.frost@offis.de" }]
7+
requires-python = ">=3.8"
8+
dependencies = [
9+
"arrow==1.2.3",
10+
"json-tricks==3.16.1",
11+
"matplotlib==3.6.2",
12+
"mosaik==3.1.0",
13+
"mosaik_api==3.0.3",
14+
"mosaik-householdsim==2.1.0",
15+
"numpy>1.24.0",
16+
"pandas==1.5.2",
17+
"protobuf==3.13.0",
18+
"psutil==5.9.4",
19+
"pytest==7.2.0",
20+
"pytest_check==1.3.0",
21+
"setuptools==65.6.3",
22+
"simpy==3.0.13",
23+
"termcolor==2.1.1",
24+
]
25+
classifiers = [
26+
"Programming Language :: Python :: 3",
27+
"Operating System :: OS Independent",
28+
"License :: OSI Approved :: GNU Lesser General Public License v2 (LGPLv2)",
29+
]
30+
31+
[project.urls]
32+
Repository = "https://gitlab.com/mosaik/examples/cosima.git"
33+
34+
[build-system]
35+
requires = ["hatchling"]
36+
build-backend = "hatchling.build"
37+
38+
[tool.hatch.build.hooks.protobuf]
39+
dependencies = ["hatch-protobuf"]
40+
proto_paths = ["../protobuf"]
41+
output_path = "src/cosima/messages"

cosima_core/results/result_1645085479.8887444.csv renamed to mosaik/results/result_1645085479.8887444.csv

File renamed without changes.

run.py renamed to mosaik/run.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import argparse
44

55
import scenario_config
6-
from cosima_core.scenarios import communication_scenario, negotiation_scenario
7-
from cosima_core.scenarios.mango import mango_cohda_scenario, mango_simple_scenario, mango_units_scenario, \
6+
from cosima.scenarios import communication_scenario, negotiation_scenario
7+
from cosima.scenarios.mango import mango_cohda_scenario, mango_simple_scenario, mango_units_scenario, \
88
mango_direct_connection_scenario, mango_direct_connection_cohda_scenario
99

1010

scenario_config.py renamed to mosaik/scenario_config.py

File renamed without changes.

cosima_core/mango_direct_connection/mango_communication_network.py renamed to mosaik/src/cosima/mango_direct_connection/mango_communication_network.py

File renamed without changes.

‎mosaik/src/cosima/messages/__init__.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
def hello() -> str:
2+
return "Hello from mosaik!"

0 commit comments

Comments
 (0)