Merge pull request #23 from PySATL/feature/remove-criteria

Move criteria to separate package

Author: alex98247

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Mironov Alexey
+Copyright (c) 2023 PySATL Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

graph_norm_experiment.py

@@ -1,6 +1,11 @@
 import multiprocessing
 
 from numpy import random as rd
+from pysatl.criterion.normal import (
+    GraphEdgesNumberNormalityGofStatistic,
+    GraphMaxDegreeNormalityGofStatistic,
+    KolmogorovSmirnovNormalityGofStatistic,
+)
 
 from stattest.experiment import Experiment
 from stattest.experiment.configuration.configuration import (
@@ -20,10 +25,7 @@
 from stattest.experiment.listener.listeners import TimeEstimationListener
 from stattest.experiment.report.model import PdfPowerReportBuilder
 from stattest.experiment.test.worker import PowerCalculationWorker
-from stattest.persistence.db_store import CriticalValueDbStore, RvsDbStore
-from stattest.persistence.db_store.result_store import ResultDbStore
-from stattest.test import KSNormalityTest
-from stattest.test.normal import GraphEdgesNumberNormTest, GraphMaxDegreeNormTest
+from stattest.persistence.db_store import CriticalValueDbStore, ResultDbStore, RvsDbStore
 
 
 if __name__ == "__main__":
@@ -53,16 +55,16 @@
         LaplaceRVSGenerator(t=0, s=1),
     ]
 
-    edges_two_tailed = GraphEdgesNumberNormTest()
+    edges_two_tailed = GraphEdgesNumberNormalityGofStatistic()
     edges_two_tailed.two_tailed = True
 
-    max_degree_two_tailed = GraphMaxDegreeNormTest()
+    max_degree_two_tailed = GraphMaxDegreeNormalityGofStatistic()
     max_degree_two_tailed.two_tailed = True
 
     tests = [
         edges_two_tailed,
         max_degree_two_tailed,
-        KSNormalityTest(),
+        KolmogorovSmirnovNormalityGofStatistic(),
     ]
 
     alternatives_configuration = AlternativeConfiguration(

pyproject.toml

@@ -18,7 +18,8 @@ dependencies = [
     "sqlalchemy>=2.0.36",
     "python-rapidjson==1.20",
     "jsonschema==4.23.0",
-    "rich==13.9.4"
+    "rich==13.9.4",
+    "pysatl-criterion==0.0.1a0"
 ]
 
 [build-system]

stattest/experiment/configuration/configuration.py

@@ -1,9 +1,10 @@
 from collections.abc import Sequence
 
+from pysatl.criterion import AbstractStatistic
+
 from stattest.experiment.generator import AbstractRVSGenerator
 from stattest.persistence import IRvsStore
 from stattest.persistence.models import IResultStore
-from stattest.test import AbstractTestStatistic
 
 
 class TestWorkerResult:
@@ -31,13 +32,11 @@ def init(self):
         pass
 
     def execute(
-        self, test: AbstractTestStatistic, data: list[list[float]], code, size: int
+        self, test: AbstractStatistic, data: list[list[float]], code, size: int
     ) -> TestWorkerResult:
         raise NotImplementedError("Method is not implemented")
 
-    def build_id(
-        self, test: AbstractTestStatistic, data: list[list[float]], code, size: int
-    ) -> str:
+    def build_id(self, test: AbstractStatistic, data: list[list[float]], code, size: int) -> str:
         raise NotImplementedError("Method is not implemented")
 
 
@@ -87,7 +86,7 @@ class TestConfiguration:
 
     def __init__(
         self,
-        tests: Sequence[AbstractTestStatistic],
+        tests: Sequence[AbstractStatistic],
         worker: TestWorker,
         threads=4,
         listeners: Sequence[StepListener] | None = None,

stattest/experiment/test/critical_value.py

@@ -1,13 +1,13 @@
 import numpy as np
 import scipy.stats as scipy_stats
+from pysatl.criterion import AbstractStatistic
 
 from stattest.experiment.hypothesis import AbstractHypothesis
 from stattest.persistence.models import ICriticalValueStore
-from stattest.test import AbstractTestStatistic
 
 
 def calculate_critical_value(
-    test: AbstractTestStatistic,
+    test: AbstractStatistic,
     hypothesis: AbstractHypothesis,
     size: int,
     alpha: float,
@@ -28,7 +28,7 @@ def calculate_critical_value(
 
 
 def calculate_two_tailed_critical_value(
-    test: AbstractTestStatistic,
+    test: AbstractStatistic,
     hypothesis: AbstractHypothesis,
     size: int,
     alpha: float,
@@ -50,7 +50,7 @@ def calculate_two_tailed_critical_value(
 
 
 def get_or_calculate_critical_value(
-    test: AbstractTestStatistic,
+    test: AbstractStatistic,
     hypothesis: AbstractHypothesis,
     size: int,
     alpha: float,

stattest/experiment/test/power_calculation.py

@@ -1,11 +1,12 @@
+from pysatl.criterion import AbstractStatistic
+
 from stattest.experiment.hypothesis import AbstractHypothesis
 from stattest.experiment.test.critical_value import get_or_calculate_critical_value
 from stattest.persistence.models import ICriticalValueStore
-from stattest.test import AbstractTestStatistic
 
 
 def execute_test(
-    test: AbstractTestStatistic,
+    test: AbstractStatistic,
     hypothesis: AbstractHypothesis,
     rvs: list[float],
     alpha: float,
@@ -26,7 +27,7 @@ def execute_test(
 
 
 def calculate_test_power(
-    test: AbstractTestStatistic,
+    test: AbstractStatistic,
     data: list[list[float]],
     hypothesis: AbstractHypothesis,
     alpha: float,

stattest/experiment/test/test_step.py

@@ -3,21 +3,21 @@
 from multiprocessing import Queue
 from multiprocessing.synchronize import Event as EventClass
 
+from pysatl.criterion import AbstractStatistic
 from tqdm import tqdm
 
 from stattest.experiment.configuration.configuration import TestConfiguration, TestWorker
 from stattest.experiment.pipeline import start_pipeline
 from stattest.persistence import IRvsStore
 from stattest.persistence.models import IResultStore
-from stattest.test import AbstractTestStatistic
 
 
 logger = logging.getLogger(__name__)
 
 
 def execute_tests(
     worker: TestWorker,
-    tests: list[AbstractTestStatistic],
+    tests: list[AbstractStatistic],
     rvs_store: IRvsStore,
     result_store: IResultStore,
     thread_count: int = 0,
@@ -67,7 +67,7 @@ def process_entries(
 
 
 def fill_queue(queue, generate_shutdown_event, kwargs):
-    tests: list[AbstractTestStatistic] = kwargs["tests"]
+    tests: list[AbstractStatistic] = kwargs["tests"]
     store: IRvsStore = kwargs["store"]
 
     store.init()
@@ -83,7 +83,7 @@ def fill_queue(queue, generate_shutdown_event, kwargs):
     return len(stat) * len(tests)
 
 
-def get_total_count(tests: Sequence[AbstractTestStatistic], store: IRvsStore):
+def get_total_count(tests: Sequence[AbstractStatistic], store: IRvsStore):
     store.init()
     stat = store.get_rvs_stat()
     return len(stat) * len(tests)

stattest/experiment/test/worker.py

@@ -1,10 +1,10 @@
+from pysatl.criterion import AbstractStatistic
 from typing_extensions import override
 
 from stattest.experiment.configuration.configuration import TestWorker, TestWorkerResult
 from stattest.experiment.hypothesis import AbstractHypothesis
 from stattest.experiment.test.power_calculation import calculate_test_power
 from stattest.persistence.models import ICriticalValueStore
-from stattest.test import AbstractTestStatistic
 
 
 class PowerWorkerResult(TestWorkerResult):
@@ -41,13 +41,13 @@ def init(self):
         self.cv_store.init()
 
     def build_id(
-        self, test: AbstractTestStatistic, data: list[list[float]], code: str, size: int
+        self, test: AbstractStatistic, data: list[list[float]], code: str, size: int
     ) -> str:
         return "_".join([str(self.alpha), str(size), test.code(), code])
 
     @override
     def execute(
-        self, test: AbstractTestStatistic, data: list[list[float]], code: str, size: int
+        self, test: AbstractStatistic, data: list[list[float]], code: str, size: int
     ) -> PowerWorkerResult:
         power = calculate_test_power(
             test, data, self.hypothesis, self.alpha, self.cv_store, self.monte_carlo_count