From a13db5732d93153869a7ec363a4c4fea5cd8a85f Mon Sep 17 00:00:00 2001
From: "Hock, Martin" <martin.hock@fst.tu-darmstadt.de>
Date: Mon, 27 Feb 2023 03:01:12 +0100
Subject: [PATCH] Renaming of file and classes to fit exercise description
---
datasheets/create_json_from_excel.py | 4 ++--
functions/{lego_classes.py => classes.py} | 1 -
test-legoclasses.ipynb => test-classes.ipynb | 4 ++--
test-legoclasses.py => test-classes.py | 15 ++++++++++++---
4 files changed, 16 insertions(+), 8 deletions(-)
rename functions/{lego_classes.py => classes.py} (99%)
rename test-legoclasses.ipynb => test-classes.ipynb (97%)
rename test-legoclasses.py => test-classes.py (76%)
diff --git a/datasheets/create_json_from_excel.py b/datasheets/create_json_from_excel.py
index 876bac1..4cdd8cf 100644
--- a/datasheets/create_json_from_excel.py
+++ b/datasheets/create_json_from_excel.py
@@ -14,8 +14,8 @@ HELP_TXT = """
1. The source excel file. (e.g. test.xlsx)
2. The destination folder for the json file. (e.g. test_folder)
3. Override the folder if existing. (OPTIONAL, False)
-
- Providing only '-- help' will show this text and exit.
+
+ Providing only '-- help' will show this text and exit.
"""
diff --git a/functions/lego_classes.py b/functions/classes.py
similarity index 99%
rename from functions/lego_classes.py
rename to functions/classes.py
index 219614f..f8d81c6 100644
--- a/functions/lego_classes.py
+++ b/functions/classes.py
@@ -2,7 +2,6 @@
File consists of several classes for the different elements of a device.
'''
from __future__ import annotations
-
from enum import Enum, auto
import uuid
from typing import Any, Union, Literal, TypedDict, TypeVar, Type, List, Optional, Dict
diff --git a/test-legoclasses.ipynb b/test-classes.ipynb
similarity index 97%
rename from test-legoclasses.ipynb
rename to test-classes.ipynb
index ba9d072..95e0adf 100644
--- a/test-legoclasses.ipynb
+++ b/test-classes.ipynb
@@ -7,8 +7,8 @@
"outputs": [],
"source": [
"# import functions.lego_classes as lego_classes\n",
- "from functions.lego_classes import LegoItem\n",
- "from functions.lego_classes import LegoComponent"
+ "from functions.classes import LegoItem\n",
+ "from functions.classes import LegoComponent"
]
},
{
diff --git a/test-legoclasses.py b/test-classes.py
similarity index 76%
rename from test-legoclasses.py
rename to test-classes.py
index 54f2900..d1282ed 100644
--- a/test-legoclasses.py
+++ b/test-classes.py
@@ -1,8 +1,15 @@
-
-# import functions.lego_classes as lego_classes
-from functions.lego_classes import *
+# import standard libraries
import json
import pprint
+# import classes from the classes module in functions package
+from functions.classes import LegoComponent
+from functions.classes import LegoAssembly
+from functions.classes import ComponentCategory
+from functions.classes import AggregationLayer
+from functions.classes import KPIEncoder
+from functions.classes import print_assembly_tree
+
+
# Test manually creating some item and components
battery = LegoComponent("nice battery", ComponentCategory.BATTERY, "bat42", 1, 2, 3)
@@ -20,9 +27,11 @@ chassis.add_assembly(door2)
engine = LegoAssembly("Engine", AggregationLayer.ASSEMBLY)
engine.add_component(motor.clone())
+
fuel_tank = LegoAssembly("Fuel Tank", AggregationLayer.ASSEMBLY)
fuel_tank.add_component(battery.clone())
+
wheels = LegoAssembly("Wheels", AggregationLayer.ASSEMBLY)
for _ in range(4):
wheels.add_component(wheel.clone())
--
GitLab