fix mypy and ruff

Author: mrprizmo

pysatl_criterion/statistics/__init__.py

@@ -33,6 +33,48 @@
     WeExponentialityGofStatistic,
     WongWongExponentialityGofStatistic,
 )
+from pysatl_criterion.statistics.log_normal import (
+    AbstractLogNormalGofStatistic,
+    AndersonDarlingLogNormalGofStatistic,
+    BonettSeierLogNormalGofStatistic,
+    BontempsMeddahi1LogNormalGofStatistic,
+    BontempsMeddahi2LogNormalGofStatistic,
+    CabanaCabana1LogNormalGofStatistic,
+    CabanaCabana2LogNormalGofStatistic,
+    ChenShapiroLogNormalGofStatistic,
+    CoinLogNormalGofStatistic,
+    CramerVonMiseLogNormalGofStatistic,
+    DagostinoLogNormalGofStatistic,
+    DAPLogNormalGofStatistic,
+    DesgagneLafayeLogNormalGofStatistic,
+    DoornikHansenLogNormalGofStatistic,
+    EppsPulleyLogNormalGofStatistic,
+    FilliLogNormalGofStatistic,
+    GlenLeemisBarrLogNormalGofStatistic,
+    GMGLogNormalGofStatistic,
+    Hosking1LogNormalGofStatistic,
+    Hosking2LogNormalGofStatistic,
+    Hosking3LogNormalGofStatistic,
+    Hosking4LogNormalGofStatistic,
+    JBLogNormalGofStatistic,
+    KolmogorovSmirnovLogNormalGofStatistic,
+    KurtosisLogNormalGofStatistic,
+    LillieforsLogNormalGofStatistic,
+    LooneyGulledgeLogNormalGofStatistic,
+    MartinezIglewiczLogNormalGofStatistic,
+    QuesenberryMillerLogNormalGofStatistic,
+    RobustJarqueBeraLogNormalGofStatistic,
+    RyanJoinerLogNormalGofStatistic,
+    SFLogNormalGofStatistic,
+    ShapiroWilkLogNormalGofStatistic,
+    SkewLogNormalGofStatistic,
+    SpiegelhalterLogNormalGofStatistic,
+    SWRGLogNormalGofStatistic,
+    ZhangQLogNormalGofStatistic,
+    ZhangQStarLogNormalGofStatistic,
+    ZhangWuALogNormalGofStatistic,
+    ZhangWuCLogNormalGofStatistic,
+)
 from pysatl_criterion.statistics.models import AbstractStatistic
 from pysatl_criterion.statistics.normal import (
     AbstractNormalityGofStatistic,
@@ -76,7 +118,6 @@
     ZhangWuANormalityGofStatistic,
     ZhangWuCNormalityGofStatistic,
 )
-from pysatl_criterion.statistics.log_normal import *
 from pysatl_criterion.statistics.weibull import (
     AbstractWeibullGofStatistic,
     AndersonDarlingWeibullGofStatistic,
@@ -100,6 +141,7 @@
     WPPWeibullGofStatistic,
 )
 
+
 __all__ = [
     "AbstractStatistic",
     "ADStatistic",

pysatl_criterion/statistics/log_normal.py

@@ -8,7 +8,6 @@
 from pysatl_criterion.statistics import normal
 from pysatl_criterion.statistics.common import CrammerVonMisesStatistic, KSStatistic
 from pysatl_criterion.statistics.goodness_of_fit import AbstractGoodnessOfFitStatistic
-from pysatl_criterion.statistics.normal import AbstractNormalityGofStatistic
 
 
 class AbstractLogNormalGofStatistic(AbstractGoodnessOfFitStatistic):
@@ -115,6 +114,150 @@ def execute_statistic(self, rvs, **kwargs):
 # =================================================================================================
 
 
+class AndersonDarlingLogNormalGofStatistic:
+    pass
+
+
+class BonettSeierLogNormalGofStatistic:
+    pass
+
+
+class BontempsMeddahi1LogNormalGofStatistic:
+    pass
+
+
+class BontempsMeddahi2LogNormalGofStatistic:
+    pass
+
+
+class CabanaCabana1LogNormalGofStatistic:
+    pass
+
+
+class CabanaCabana2LogNormalGofStatistic:
+    pass
+
+
+class ChenShapiroLogNormalGofStatistic:
+    pass
+
+
+class CoinLogNormalGofStatistic:
+    pass
+
+
+class DagostinoLogNormalGofStatistic:
+    pass
+
+
+class DAPLogNormalGofStatistic:
+    pass
+
+
+class DesgagneLafayeLogNormalGofStatistic:
+    pass
+
+
+class DoornikHansenLogNormalGofStatistic:
+    pass
+
+
+class EppsPulleyLogNormalGofStatistic:
+    pass
+
+
+class FilliLogNormalGofStatistic:
+    pass
+
+
+class GlenLeemisBarrLogNormalGofStatistic:
+    pass
+
+
+class GMGLogNormalGofStatistic:
+    pass
+
+
+class Hosking1LogNormalGofStatistic:
+    pass
+
+
+class Hosking2LogNormalGofStatistic:
+    pass
+
+
+class Hosking3LogNormalGofStatistic:
+    pass
+
+
+class Hosking4LogNormalGofStatistic:
+    pass
+
+
+class JBLogNormalGofStatistic:
+    pass
+
+
+class KurtosisLogNormalGofStatistic:
+    pass
+
+
+class LillieforsLogNormalGofStatistic:
+    pass
+
+
+class LooneyGulledgeLogNormalGofStatistic:
+    pass
+
+
+class MartinezIglewiczLogNormalGofStatistic:
+    pass
+
+
+class RobustJarqueBeraLogNormalGofStatistic:
+    pass
+
+
+class RyanJoinerLogNormalGofStatistic:
+    pass
+
+
+class SFLogNormalGofStatistic:
+    pass
+
+
+class ShapiroWilkLogNormalGofStatistic:
+    pass
+
+
+class SkewLogNormalGofStatistic:
+    pass
+
+
+class SpiegelhalterLogNormalGofStatistic:
+    pass
+
+
+class SWRGLogNormalGofStatistic:
+    pass
+
+
+class ZhangQLogNormalGofStatistic:
+    pass
+
+
+class ZhangQStarLogNormalGofStatistic:
+    pass
+
+
+class ZhangWuALogNormalGofStatistic:
+    pass
+
+
+class ZhangWuCLogNormalGofStatistic:
+    pass
+
+
 def _create_lognormal_class(normal_cls):
     new_class_name = normal_cls.__name__.replace("Normality", "LogNormal")
     class_code = normal_cls.code().replace("NORMALITY", "LOGNORMAL")
@@ -142,8 +285,47 @@ def code():
     return LogNormalClass
 
 
-# List of Normal statistics that we have explicitly implemented for LogNormal above.
-# We should NOT generate dynamic wrappers for these.
+_REQUESTED_CLASS_NAMES = [
+    "AndersonDarlingNormalityGofStatistic",
+    "BonettSeierNormalityGofStatistic",
+    "BontempsMeddahi1NormalityGofStatistic",
+    "BontempsMeddahi2NormalityGofStatistic",
+    "CabanaCabana1NormalityGofStatistic",
+    "CabanaCabana2NormalityGofStatistic",
+    "ChenShapiroNormalityGofStatistic",
+    "CoinNormalityGofStatistic",
+    "CramerVonMiseNormalityGofStatistic",
+    "DagostinoNormalityGofStatistic",
+    "DAPNormalityGofStatistic",
+    "DesgagneLafayeNormalityGofStatistic",
+    "DoornikHansenNormalityGofStatistic",
+    "EppsPulleyNormalityGofStatistic",
+    "FilliNormalityGofStatistic",
+    "GlenLeemisBarrNormalityGofStatistic",
+    "GMGNormalityGofStatistic",
+    "Hosking1NormalityGofStatistic",
+    "Hosking2NormalityGofStatistic",
+    "Hosking3NormalityGofStatistic",
+    "Hosking4NormalityGofStatistic",
+    "JBNormalityGofStatistic",
+    "KolmogorovSmirnovNormalityGofStatistic",
+    "KurtosisNormalityGofStatistic",
+    "LillieforsNormalityGofStatistic",
+    "LooneyGulledgeNormalityGofStatistic",
+    "MartinezIglewiczNormalityGofStatistic",
+    "RobustJarqueBeraNormalityGofStatistic",
+    "RyanJoinerNormalityGofStatistic",
+    "SFNormalityGofStatistic",
+    "SkewNormalityGofStatistic",
+    "SpiegelhalterNormalityGofStatistic",
+    "ShapiroWilkNormalityGofStatistic",
+    "SWRGNormalityGofStatistic",
+    "ZhangQNormalityGofStatistic",
+    "ZhangQStarNormalityGofStatistic",
+    "ZhangWuANormalityGofStatistic",
+    "ZhangWuCNormalityGofStatistic",
+]
+
 _EXPLICITLY_IMPLEMENTED_NORMAL_STATS = [
     "KolmogorovSmirnovNormalityGofStatistic",
     "CramerVonMiseNormalityGofStatistic",
@@ -162,11 +344,8 @@ def code():
 for name, obj in inspect.getmembers(normal):
     if (
         inspect.isclass(obj)
-        and issubclass(obj, AbstractNormalityGofStatistic)
-        and obj is not AbstractNormalityGofStatistic
+        and name in _REQUESTED_CLASS_NAMES
         and name not in _EXPLICITLY_IMPLEMENTED_NORMAL_STATS
-        and not name.startswith("Abstract")
-        and not name.startswith("Graph")
     ):
         ln_class = _create_lognormal_class(obj)
         setattr(current_module, ln_class.__name__, ln_class)