Skip to content
This repository has been archived by the owner on Feb 10, 2022. It is now read-only.

List all importing tools with their version #133

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
17 changes: 11 additions & 6 deletions result_tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ def build_matrix(results, fmi_version, fmi_type, platform):
""" Build the result matrix for an FMI version, type and platform """

importing_tools = set()
importing_tools_with_version = set()
exporting_tools = set()

filtered = []
Expand All @@ -74,28 +75,32 @@ def build_matrix(results, fmi_version, fmi_type, platform):
if fmi_version_ != fmi_version or fmi_type_ != fmi_type or platform_ != platform:
continue

importing_tools_with_version_name = f'{importing_tool_name} ({importing_tool_version})'

importing_tools.add(importing_tool_name)
importing_tools_with_version.add(importing_tools_with_version_name)
exporting_tools.add(exporting_tool_name)

filtered.append((importing_tool_name, importing_tool_version, exporting_tool_name, exporting_tool_version, model_name))
filtered.append((importing_tool_name, importing_tool_version, importing_tools_with_version_name, exporting_tool_name, exporting_tool_version, model_name))

# build matrix
importing_tools = sorted(importing_tools, key=lambda s: s.lower())
importing_tools_with_version = sorted(importing_tools_with_version, key=lambda s: s.lower())
exporting_tools = sorted(exporting_tools, key=lambda s: s.lower())

matrix = []

for importing_tool in importing_tools:
for importing_tool in importing_tools_with_version:
row = []
for exporting_tool in exporting_tools:
count = 0
for r in filtered:
if r[0] == importing_tool and r[2] == exporting_tool:
if r[2] == importing_tool and r[3] == exporting_tool:
count += 1
row.append(count)
matrix.append(row)

return importing_tools, exporting_tools, matrix
return importing_tools, importing_tools_with_version, exporting_tools, matrix

results = collect_results()

Expand All @@ -109,7 +114,7 @@ def build_matrix(results, fmi_version, fmi_type, platform):

for fmi_version, fmi_type, platform in combinations:

importing_tools, exporting_tools, matrix = matrices[(fmi_version, fmi_type, platform)]
importing_tools, importing_tools_with_version, exporting_tools, matrix = matrices[(fmi_version, fmi_type, platform)]

importing_tools = [tools[tool_id] for tool_id in importing_tools]
exporting_tools = [tools[tool_id] for tool_id in exporting_tools]
Expand All @@ -122,7 +127,7 @@ def build_matrix(results, fmi_version, fmi_type, platform):

with open(os.path.join(data_dir, 'cross-check', csv_filename), 'w') as f:
f.write(','.join([''] + exporting_tools) + '\n')
for importing_tool, row in zip(importing_tools, matrix):
for importing_tool, row in zip(importing_tools_with_version, matrix):
f.write(','.join([importing_tool] + list(map(str, row))) + '\n')

participants = set()
Expand Down