diff --git a/display.py b/display.py index e9f11a0..2e4c03c 100755 --- a/display.py +++ b/display.py @@ -1,16 +1,16 @@ #!/usr/bin/env python3 from gettext import install -from backscattering_analyzer.display import show_projection # type: ignore[reportMissingTypeStubs] -from backscattering_analyzer.experiment import Experiment # type: ignore[reportMissingTypeStubs] +from backscattering_analyzer.display import show_projection # type: ignore[reportMissingTypeStubs] +from backscattering_analyzer.experiment import Experiment # type: ignore[reportMissingTypeStubs] from logging import basicConfig, getLogger from rich.console import Console from rich.theme import Theme from rich.logging import RichHandler from warnings import filterwarnings -from command_parser.flag import Flag # type: ignore[reportMissingTypeStubs] -from command_parser.value import Value # type: ignore[reportMissingTypeStubs] -from command_parser.parser import parse # type: ignore[reportMissingTypeStubs] +from command_parser.flag import Flag # type: ignore[reportMissingTypeStubs] +from command_parser.value import Value # type: ignore[reportMissingTypeStubs] +from command_parser.parser import parse # type: ignore[reportMissingTypeStubs] from sys import argv from importlib.metadata import version @@ -127,15 +127,12 @@ if flags[3].value: float(values[3].value), ) experiment.factors = experiment.fit_factors( - start_frequency = 15, - end_frequency = 100, + start_frequency=15, + end_frequency=100, + ) + results["{bench}-{date}".format(bench=bench, date=date)] = ( + experiment.factors["true"] ) - results[ - "{bench}-{date}".format( - bench=bench, - date=date - ) - ] = experiment.factors["true"] else: # bench == SWEB for date in ["2023_03_24", "2023_12_20"]: experiment = Experiment( @@ -145,15 +142,12 @@ if flags[3].value: float(values[3].value), ) experiment.factors = experiment.fit_factors( - start_frequency = 15, - end_frequency = 100, + start_frequency=15, + end_frequency=100, + ) + results["{bench}-{date}".format(bench=bench, date=date)] = ( + experiment.factors["true"] ) - results[ - "{bench}-{date}".format( - bench=bench, - date=date - ) - ] = experiment.factors["true"] console = Console() console.print(results) @@ -169,10 +163,13 @@ else: else: start_frequency, end_frequency = 15, 100 - experiment.factors = experiment.fit_factors( - start_frequency=start_frequency, - end_frequency=end_frequency, - ) + try: + experiment.factors = experiment.fit_factors( + start_frequency=start_frequency, + end_frequency=end_frequency, + ) + except AttributeError: + pass show_projection(experiment, start_frequency, end_frequency)