Architecture refactoring

graph_norm_experiment.py

@@ -1,7 +1,7 @@
 import multiprocessing
 
 from numpy import random as rd
-from pysatl.criterion.normal import (
+from pysatl_criterion.statistics.normal import (
     GraphEdgesNumberNormalityGofStatistic,
     GraphMaxDegreeNormalityGofStatistic,
     KolmogorovSmirnovNormalityGofStatistic,

pyproject.toml

@@ -19,15 +19,17 @@ dependencies = [
     "python-rapidjson==1.20",
     "jsonschema==4.23.0",
     "rich==13.9.4",
-    "pysatl-criterion==0.0.1a0"
+    "click>=8.2.1",
+    "pysatl-criterion @ git+https://github.com/PySATL/pysatl-criterion.git"
 ]
 
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
-package-mode = false
+package-mode = true
+packages = [{include = "stattest"}]
 
 [tool.poetry.group.dev.dependencies]
 markdown = "3.7"
@@ -84,3 +86,6 @@ exclude = [".git", "__pycache__", ".eggs", "user_data", ".venv", ".env"]
 "tests/**/*.py" = [
   "S101", "S104", "S311", "S105", "S106", "S110"
 ]
+
+[tool.poetry.scripts]
+experiment = "stattest.cli.cli:cli"

stattest/configuration/experiment_config/critical_value/critical_value.py

@@ -0,0 +1,12 @@
+from dataclasses import dataclass
+
+from stattest.configuration.experiment_config.experiment_config import ExperimentConfig
+
+
+@dataclass
+class CriticalValueExperimentConfig(ExperimentConfig):
+    """
+    Critical value experiment configuration.
+    """
+
+    significance_levels: list[float]

stattest/configuration/experiment_config/experiment_config.py

@@ -0,0 +1,25 @@
+from dataclasses import dataclass
+
+from stattest.configuration.model.criterion.criterion import Criterion
+from stattest.configuration.model.experiment_type.experiment_type import ExperimentType
+from stattest.configuration.model.hypothesis.hypothesis import Hypothesis
+from stattest.configuration.model.run_mode.run_mode import RunMode
+from stattest.configuration.model.step_type.step_type import StepType
+
+
+@dataclass
+class ExperimentConfig:
+    """
+    Experiment configuration.
+    """
+
+    experiment_type: ExperimentType
+    storage_connection: str
+    run_mode: RunMode
+    hypothesis: Hypothesis
+    data_generator_type: StepType
+    executor_type: StepType
+    report_builder_type: StepType
+    sample_sizes: list[int]
+    monte_carlo_count: int
+    criteria: list[Criterion]

stattest/configuration/experiment_config/power/power.py

@@ -0,0 +1,14 @@
+from dataclasses import dataclass
+
+from stattest.configuration.experiment_config.experiment_config import ExperimentConfig
+from stattest.configuration.model.alternative.alternative import Alternative
+
+
+@dataclass
+class PowerExperimentConfig(ExperimentConfig):
+    """
+    Power experiment configuration.
+    """
+
+    alternatives: list[Alternative]
+    significance_levels: list[float]

stattest/configuration/experiment_config/time_complexity/time_complexity.py

@@ -0,0 +1,10 @@
+from dataclasses import dataclass
+
+from stattest.configuration.experiment_config.experiment_config import ExperimentConfig
+
+
+@dataclass
+class TimeComplexityExperimentConfig(ExperimentConfig):
+    """
+    Time complexity experiment configuration.
+    """

stattest/configuration/model/alternative/alternative.py

@@ -0,0 +1,11 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class Alternative:
+    """
+    Alternative configuration (generator code + parameters).
+    """
+
+    generator_code: str
+    parameters: list[float]

stattest/configuration/model/criterion/criterion.py

@@ -0,0 +1,11 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class Criterion:
+    """
+    Criterion configuration (criterion code + parameters).
+    """
+
+    criterion_code: str
+    parameters: list[float]

stattest/configuration/model/experiment_type/experiment_type.py

@@ -0,0 +1,11 @@
+from enum import Enum
+
+
+class ExperimentType(Enum):
+    """
+    Experiment type.
+    """
+
+    CRITICAL_VALUE = "critical_value"
+    POWER = "power"
+    TIME_COMPLEXITY = "time_complexity"

stattest/configuration/model/hypothesis/hypothesis.py

@@ -0,0 +1,11 @@
+from enum import Enum
+
+
+class Hypothesis(Enum):
+    """
+    Hypothesis.
+    """
+
+    NORMAL = "normal"
+    EXPONENTIAL = "exponential"
+    WEIBULL = "weibull"

stattest/configuration/model/run_mode/run_mode.py

@@ -0,0 +1,10 @@
+from enum import Enum
+
+
+class RunMode(Enum):
+    """
+    Run mode (use existing data in DB or overwrite).
+    """
+
+    REUSE = "reuse"
+    OVERWRITE = "overwrite"

stattest/configuration/model/step_type/step_type.py

@@ -0,0 +1,10 @@
+from enum import Enum
+
+
+class StepType(Enum):
+    """
+    Step type (standard or custom).
+    """
+
+    STANDARD = "standard"
+    CUSTOM = "custom"

stattest/experiment/configuration/configuration.py

@@ -1,6 +1,6 @@
 from collections.abc import Sequence
 
-from pysatl.criterion import AbstractStatistic
+from pysatl_criterion.statistics import AbstractStatistic
 
 from stattest.experiment.generator import AbstractRVSGenerator
 from stattest.persistence import IRvsStore

stattest/experiment/test/critical_value.py

@@ -1,6 +1,6 @@
 import numpy as np
 import scipy.stats as scipy_stats
-from pysatl.criterion import AbstractStatistic
+from pysatl_criterion.statistics import AbstractStatistic
 
 from stattest.experiment.hypothesis import AbstractHypothesis
 from stattest.persistence.models import ICriticalValueStore

stattest/experiment/test/power_calculation.py

@@ -1,4 +1,4 @@
-from pysatl.criterion import AbstractStatistic
+from pysatl_criterion.statistics import AbstractStatistic
 
 from stattest.experiment.hypothesis import AbstractHypothesis
 from stattest.experiment.test.critical_value import get_or_calculate_critical_value

stattest/experiment/test/test_step.py

@@ -3,7 +3,7 @@
 from multiprocessing import Queue
 from multiprocessing.synchronize import Event as EventClass
 
-from pysatl.criterion import AbstractStatistic
+from pysatl_criterion.statistics import AbstractStatistic
 from tqdm import tqdm
 
 from stattest.experiment.configuration.configuration import TestConfiguration, TestWorker

stattest/experiment/test/worker.py

@@ -1,4 +1,4 @@
-from pysatl.criterion import AbstractStatistic
+from pysatl_criterion.statistics import AbstractStatistic
 from typing_extensions import override
 
 from stattest.experiment.configuration.configuration import TestWorker, TestWorkerResult

stattest/experiment_new/experiment_steps/experiment_steps.py

@@ -0,0 +1,14 @@
+from dataclasses import dataclass
+
+from stattest.experiment_new.model.experiment_step.experiment_step import IExperimentStep
+
+
+@dataclass
+class ExperimentSteps:
+    """
+    Experiment steps dataclass.
+    """
+
+    generation_step: IExperimentStep
+    execution_step: IExperimentStep
+    report_building_step: IExperimentStep

stattest/experiment_new/model/experiment.py

@@ -0,0 +1,31 @@
+from stattest.experiment_new.experiment_steps.experiment_steps import ExperimentSteps
+from stattest.experiment_new.model.experiment_step.experiment_step import IExperimentStep
+
+
+class Experiment:
+    """
+    Experiment.
+    """
+
+    def __init__(self, experiment_steps: ExperimentSteps):
+        self.experiment_steps = experiment_steps
+
+    def run_experiment(self) -> None:
+        """
+        Run experiment.
+        """
+        generation_step: IExperimentStep = self.experiment_steps.generation_step
+        execution_step: IExperimentStep = self.experiment_steps.execution_step
+        report_building_step: IExperimentStep = self.experiment_steps.report_building_step
+
+        print("Running generation step...")
+        generation_step.run()
+        print("Generation step finished")
+
+        print("Running execution step...")
+        execution_step.run()
+        print("Execution step finished")
+
+        print("Running report building step...")
+        report_building_step.run()
+        print("Report building step finished")

stattest/experiment_new/model/experiment_step/experiment_step.py

@@ -0,0 +1,10 @@
+from typing import Protocol
+
+
+class IExperimentStep(Protocol):
+    """
+    Interface for experiment step.
+    """
+
+    def run(self) -> None:
+        pass

stattest/experiment_new/step/execution/common/execution_step_data/execution_step_data.py

@@ -0,0 +1,13 @@
+from dataclasses import dataclass
+
+from pysatl_criterion.statistics.goodness_of_fit import AbstractGoodnessOfFitStatistic
+
+
+@dataclass
+class ExecutionStepData:
+    """
+    Data for execution step.
+    """
+
+    criterion: AbstractGoodnessOfFitStatistic
+    sample_size: int

stattest/experiment_new/step/execution/critical_value/critical_value.py

@@ -0,0 +1,44 @@
+from dataclasses import dataclass
+
+from pysatl_criterion.persistence.model.limit_distribution.limit_distribution import (
+    ILimitDistributionStorage,
+)
+
+from stattest.experiment_new.step.execution.common.execution_step_data.execution_step_data import (
+    ExecutionStepData,
+)
+from stattest.persistence.model.random_values.random_values import IRandomValuesStorage
+from stattest.worker.critical_value.critical_value import CriticalValueWorker
+
+
+@dataclass
+class CriticalValueStepData(ExecutionStepData):
+    """
+    Data for execution step in critical value experiment.
+    """
+
+
+class CriticalValueExecutionStep:
+    """
+    Standard critical value experiment execution step.
+    """
+
+    def __init__(
+        self,
+        worker: CriticalValueWorker,
+        step_data: list[CriticalValueStepData],
+        monte_carlo_count: int,
+        data_storage: IRandomValuesStorage,
+        result_storage: ILimitDistributionStorage,
+    ):
+        self.worker = worker
+        self.step_data = step_data
+        self.monte_carlo_count = monte_carlo_count
+        self.data_storage = data_storage
+        self.result_storage = result_storage
+
+    def run(self) -> None:
+        """
+        Run standard critical value execution step.
+        """
+        raise NotImplementedError("Method is not yet implemented")

stattest/experiment_new/step/execution/power/power.py

@@ -0,0 +1,45 @@
+from dataclasses import dataclass
+
+from stattest.experiment.generator import AbstractRVSGenerator
+from stattest.experiment_new.step.execution.common.execution_step_data.execution_step_data import (
+    ExecutionStepData,
+)
+from stattest.persistence.model.power.power import IPowerStorage
+from stattest.persistence.model.random_values.random_values import IRandomValuesStorage
+from stattest.worker.power.power import PowerWorker
+
+
+@dataclass
+class PowerStepData(ExecutionStepData):
+    """
+    Data for execution step in power experiment.
+    """
+
+    alternative: AbstractRVSGenerator
+    significance_level: float
+
+
+class PowerExecutionStep:
+    """
+    Standard power experiment execution step.
+    """
+
+    def __init__(
+        self,
+        worker: PowerWorker,
+        step_data: list[PowerStepData],
+        monte_carlo_count: int,
+        data_storage: IRandomValuesStorage,
+        result_storage: IPowerStorage,
+    ):
+        self.worker = worker
+        self.step_data = step_data
+        self.monte_carlo_count = monte_carlo_count
+        self.data_storage = data_storage
+        self.result_storage = result_storage
+
+    def run(self) -> None:
+        """
+        Run standard power execution step.
+        """
+        raise NotImplementedError("Method is not yet implemented")