Skip to content

Fix to LCAbyg export algorithm #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LasSteJen wants to merge 2 commits into from
Closed

Fix to LCAbyg export algorithm #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c2520b
Fix to LCAbyg export algorithm
Apr 30, 2024
a59a2e4
Fixed formatting in to_lcabyg.py
Apr 30, 2024
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
10 changes: 5 additions & 5 deletions src/logic/export/lcabyg/nodes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class ClassNode(Node):
def __init__(self, entity: SchemaCategory | SchemaElement):
self.id = entity.id
self.name = getattr(entity, "name", None) or entity.type_code_element.name
self.comment = entity.description
self.comment = entity.description or ""
self.unit = self._get_unit(entity)
self.element_category_id = self._resolve_category_name(entity)
super().__init__()
Expand Down Expand Up @@ -79,9 +79,9 @@ def _resolve_category_name(entity: SchemaCategory | SchemaElement) -> str | None


class DictNode(Node):
def __init__(self, entity: dict):
def __init__(self, entity: dict, name: str = None):
self.id = entity.get("id")
self.name = entity.get("name")
self.name = name or entity.get("name")
self.comment = entity.get("description", "") or ""
super().__init__()

Expand Down Expand Up @@ -186,7 +186,7 @@ def __init__(self, entity: dict, stage: str):
self.valid_to = epd.get("validUntil")
self.mass_factor = self._get_mass_factor(epd)
self.element_category_id = "f1bca522-df0d-4b74-a5de-cdecc2763d05"
super().__init__(epd)
super().__init__(epd, f'{epd.get("name")} ({stage})')

def set_indicators(self, entity: dict, stage: str):
if stage == "A1to3":
Expand All @@ -206,7 +206,7 @@ def set_indicators(self, entity: dict, stage: str):
@staticmethod
def _get_mass_factor(entity: dict) -> float:
for conversion in entity.get("conversions"):
if conversion.get("to") == "kg":
if conversion.get("to").casefold() == "kg":
return conversion.get("value")

def as_dict(self) -> dict:
Expand Down
21 changes: 14 additions & 7 deletions src/logic/export/to_lcabyg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ def aggregate_lcabyg_models(
"""

entity_list = []
layer_nodes = {}
for category in schema_categories:
if category.elements == []: # pragma: no branch
continue
Expand All @@ -60,12 +61,18 @@ def aggregate_lcabyg_models(
for assembly in assemblies:
if assembly["id"] == element.assembly_id:
for layer in assembly.get("layers", []):
layer_node = create_node(layer)
entity_list.extend([layer_node, create_edge(layer_node, element_node)])
for phase in ["A1to3", "C3", "C4", "D"]:
phase_node = create_node((layer, phase))
entity_list.extend(
[phase_node, create_edge(phase_node, layer_node), create_edge(phase_node)] # ])
)
if layer["id"] not in layer_nodes:
layer_node = create_node(layer)
layer_nodes[layer["id"]] = layer_node
entity_list.append(layer_node)
for phase in ["A1to3", "C3", "C4", "D"]:
phase_node = create_node((layer, phase))
entity_list.extend(
[phase_node, create_edge(phase_node, layer_node), create_edge(phase_node)] # ])
)
else:
layer_node = layer_nodes[layer["id"]]

entity_list.append(create_edge(layer_node, element_node))

return entity_list