Merge pull request #13 from PySATL/feature/weibull_experiment

Author: alex98247

stattest/core/distribution/gompertz.py

@@ -0,0 +1,5 @@
+from scipy.stats import gompertz
+
+
+def generate_gompertz(size, eta=0, b=1):
+    return gompertz.rvs(eta, size=size, scale=b)

stattest/core/distribution/invgauss.py

@@ -0,0 +1,5 @@
+from scipy.stats import invgauss
+
+
+def generate_invgauss(size, mu=0, lam=1):
+    return invgauss.rvs(mu, size=size, scale=lam)

stattest/core/distribution/rice.py

@@ -0,0 +1,5 @@
+from scipy.stats import rice
+
+
+def generate_rice(size, nu=0, sigma=1):
+    return rice.rvs(nu, size=size, scale=sigma)

stattest/experiment/configuration/configuration.py

@@ -1,7 +1,6 @@
 from typing import List, Optional, Sequence
 
 from stattest.experiment.generator import AbstractRVSGenerator
-from stattest.experiment.hypothesis import AbstractHypothesis
 from stattest.persistence import IRvsStore
 from stattest.persistence.models import IResultStore
 from stattest.test import AbstractTestStatistic
@@ -90,7 +89,6 @@ def __init__(
         self,
         tests: Sequence[AbstractTestStatistic],
         worker: TestWorker,
-        hypothesis: AbstractHypothesis,
         threads=4,
         listeners: Optional[Sequence[StepListener]] = None,
         skip_step: bool = False,
@@ -101,7 +99,6 @@ def __init__(
         self.threads = threads
         self.listeners = listeners
         self.worker = worker
-        self.hypothesis = hypothesis
         self.skip_step = skip_step
 
 

stattest/experiment/generator/generator_step.py

@@ -48,23 +48,28 @@ def process_entries(
 def fill_queue(
     queue,
     generate_shutdown_event,
-    sizes=None,
-    count=0,
-    store=None,
-    rvs_generators: Optional[List[AbstractRVSGenerator]] = None,
+    kwargs,
 ):
+    sizes = kwargs["sizes"]
+    count = kwargs["count"]
+    store: IRvsStore = kwargs["store"]
+    rvs_generators: Optional[List[AbstractRVSGenerator]] = kwargs["rvs_generators"]
+
+    store.init()
+
     for size in sizes:
         for generator in rvs_generators:
-            code = generator.code()
-            data_count = store.get_rvs_count(code, size)
-            if data_count < count:
-                count = count - data_count
-                queue.put((generator, size, count))
+            try:
+                code = generator.code()
+                data_count = store.get_rvs_count(code, size)
+                if data_count < count:
+                    count = count - data_count
+                    queue.put((generator, size, count))
+            except Exception as e:
+                logger.warning(f"Error on generation ${generator.code()} with size ${size}", e)
 
     generate_shutdown_event.set()
 
-    return len(sizes) * len(rvs_generators)
-
 
 def data_generation_step(alternative_configuration: AlternativeConfiguration, store: IRvsStore):
     """
@@ -97,6 +102,8 @@ def data_generation_step(alternative_configuration: AlternativeConfiguration, st
         fill_queue,
         process_entries,
         threads_count,
+        total_count=len(sizes) * len(rvs_generators),
+        queue_size=2000,
         sizes=sizes,
         count=alternative_configuration.count,
         rvs_generators=rvs_generators,