sflkit 0.4.0__tar.gz → 0.5.1__tar.gz

{sflkit-0.4.0/src/sflkit.egg-info → sflkit-0.5.1}/PKG-INFO

@@ -1,41 +1,21 @@
 Metadata-Version: 2.4
 Name: sflkit
-Version: 0.4.0
+Version: 0.5.1
 Summary: SFLKit: : A Workbench for Statistical Fault Localization
 Author-email: Marius Smytzek <marius.smytzek@cispa.de>
-License: MIT License
-        
-        Copyright (c) 2022 Marius Smytzek
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
-        
 Project-URL: Homepage, https://github.com/smythi93/sflkit/
 Project-URL: Bug Tracker, https://github.com/smythi93/sflkit/issues
 Classifier: Intended Audience :: Science/Research
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.10
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Software Development :: Testing
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: sflkitlib>=0.1.1
+Requires-Dist: sflkitlib>=0.2.2
 Requires-Dist: numpy>=2.1.3
 Requires-Dist: matplotlib>=3.10.0
 Requires-Dist: pandas>=2.2.3

{sflkit-0.4.0 → sflkit-0.5.1}/pyproject.toml

@@ -7,23 +7,25 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sflkit"
-version = "0.4.0"
+dynamic = ["version"]
 authors = [
     { name = "Marius Smytzek", email = "marius.smytzek@cispa.de" },
 ]
 description = "SFLKit: : A Workbench for Statistical Fault Localization"
 readme = "README.md"
-license = { file = "LICENSE" }
+license-files = ["LICENSE*"]
 requires-python = ">=3.10"
 classifiers = [
     "Intended Audience :: Science/Research",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.10",
-    "License :: OSI Approved :: MIT License",
     "Topic :: Scientific/Engineering",
     "Topic :: Software Development :: Testing"
 ]
 dependencies = [
-    "sflkitlib>=0.1.1",
+    "sflkitlib>=0.2.2",
     "numpy>=2.1.3",
     "matplotlib>=3.10.0",
     "pandas>=2.2.3",
@@ -35,9 +37,16 @@ dependencies = [
 "Homepage" = "https://github.com/smythi93/sflkit/"
 "Bug Tracker" = "https://github.com/smythi93/sflkit/issues"
 
+[tool.setuptools.dynamic]
+version = {attr = "sflkit.__version__"}
+
 [project.scripts]
 sflkit = "sflkit.cli:main"
 
+# only include packages in src/
+[tool.setuptools.packages.find]
+where = ["src"]
+
 [project.optional-dependencies]
 test = [
     "pytest>=8.3.4",

{sflkit-0.4.0 → sflkit-0.5.1}/src/sflkit/__init__.py

@@ -6,6 +6,9 @@ from sflkit.config import Config, parse_config
 from sflkit.instrumentation.dir_instrumentation import DirInstrumentation
 
 
+__version__ = "0.5.1"
+
+
 def instrument_config(conf: Config):
     instrumentation = DirInstrumentation(
         conf.visitor, conf.mapping.path, test_visitor=conf.test_visitor
@@ -54,10 +57,10 @@ def analyze_config(conf: Config, analysis_dump: PathLike = None):
         results[analysis_type.name] = dict()
         for metric in conf.metrics:
             try:
-                results[analysis_type.name][
-                    metric.__name__
-                ] = analyzer.get_sorted_suggestions(
-                    conf.target_path, metric, analysis_type
+                results[analysis_type.name][metric.__name__] = (
+                    analyzer.get_sorted_suggestions(
+                        conf.target_path, metric, analysis_type
+                    )
                 )
             except (AttributeError, ValueError, TypeError) as e:
                 raise e

{sflkit-0.4.0 → sflkit-0.5.1}/src/sflkit/analysis/analysis_type.py

@@ -1,6 +1,6 @@
+import abc
 import enum
-from abc import abstractmethod
-from typing import List, Type, Optional
+from typing import List, Type, Optional, Any
 
 from sflkit.events.event_file import EventFile
 from sflkit.model.scope import Scope
@@ -43,7 +43,7 @@ If you want to add new spectra or predicates, please register them here and in s
 """
 
 
-class AnalysisObject:
+class AnalysisObject(abc.ABC):
     function_finder = None
     loop_finder = None
     branch_finder = None
@@ -58,17 +58,17 @@ class AnalysisObject:
     def __init__(self):
         self.suspiciousness: float = 0
         self.last_evaluation: EvaluationResult = EvaluationResult.UNOBSERVED
-        self.hits = dict()
+        self.hits: dict[EventFile, dict[Optional[int], Any]] = dict()
 
     def adjust_weight(self, event_file: EventFile, weight: float):
         pass
 
-    @abstractmethod
+    @abc.abstractmethod
     def serialize(self) -> dict:
         pass
 
     @staticmethod
-    @abstractmethod
+    @abc.abstractmethod
     def deserialize(s: dict) -> "AnalysisObject":
         pass
 
@@ -82,7 +82,7 @@ class AnalysisObject:
         return f"{self.analysis_type()}"
 
     @staticmethod
-    @abstractmethod
+    @abc.abstractmethod
     def analysis_type() -> AnalysisType:
         raise NotImplementedError()
 
@@ -93,19 +93,19 @@ class AnalysisObject:
     def calculate(self):
         pass
 
-    @abstractmethod
+    @abc.abstractmethod
     def finalize(self, passed: List, failed: List):
         raise NotImplementedError()
 
-    @abstractmethod
-    def hit(self, id_, event, scope_: Scope = None):
+    @abc.abstractmethod
+    def hit(self, id_: EventFile, event, scope: Scope = None):
         raise NotImplementedError()
 
-    @abstractmethod
+    @abc.abstractmethod
     def get_suggestion(self):
         raise NotImplementedError()
 
-    @abstractmethod
+    @abc.abstractmethod
     def assign_suspiciousness(self):
         raise NotImplementedError()
 
@@ -114,7 +114,7 @@ class AnalysisObject:
         return any(map(lambda e: isinstance(event, e), events))
 
     @staticmethod
-    @abstractmethod
+    @abc.abstractmethod
     def events() -> List[Type]:
         raise NotImplementedError()
 

{sflkit-0.4.0 → sflkit-0.5.1}/src/sflkit/analysis/analyzer.py

@@ -1,5 +1,6 @@
 import json
 import os
+from concurrent.futures import ThreadPoolExecutor
 from typing import List, Callable, Set, Dict, Optional, Any, Type
 
 from sflkit.analysis.analysis_type import AnalysisType, AnalysisObject
@@ -22,6 +23,7 @@ from sflkit.analysis.spectra import Line, Function, DefUse, Loop, Length
 from sflkit.analysis.suggestion import Suggestion
 from sflkit.events.event_file import EventFile
 from sflkit.model.model import Model, MetaModel
+from sflkit.model.parallel import ParallelModel
 
 
 class AnalysisEncoder(json.JSONEncoder):
@@ -39,7 +41,9 @@ class Analyzer:
         irrelevant_event_files: Optional[List[EventFile]] = None,
         factory: Optional[AnalysisFactory] = None,
         meta_model: Optional[MetaModel] = None,
-        model_class: Type[Model] = Model,
+        model_class: Type[Model] = None,
+        parallel: bool = False,
+        workers: int = 4,
     ):
         if (
             relevant_event_files is None
@@ -56,7 +60,13 @@ class Analyzer:
         if self.meta:
             self.model = meta_model
         else:
+            if model_class is None:
+                if parallel:
+                    model_class = ParallelModel
+                else:
+                    model_class = Model
             self.model = model_class(factory)
+        self.workers = workers
         self.paths: Dict[int, os.PathLike] = dict()
         self.max_suspiciousness = 0
         self.min_suspiciousness = 0
@@ -69,7 +79,7 @@ class Analyzer:
         self.model.prepare(event_file)
         with event_file:
             for event in event_file.load():
-                event.handle(self.model)
+                event.handle(self.model, event_file)
         self.model.follow_up(event_file)
 
     def _finalize(self):
@@ -80,9 +90,16 @@ class Analyzer:
     def analyze(self):
         if self.meta:
             raise NotImplementedError("Not implemented for meta/loaded analyzer")
-        for event_file in self.relevant_event_files + self.irrelevant_event_files:
-            self.paths[event_file.run_id] = event_file.path
-            self._analyze(event_file)
+        if self.workers > 1:
+            event_files = self.relevant_event_files + self.irrelevant_event_files
+            for event_file in event_files:
+                self.paths[event_file.run_id] = event_file.path
+            with ThreadPoolExecutor(max_workers=self.workers) as executor:
+                list(executor.map(self._analyze, event_files))
+        else:
+            for event_file in self.relevant_event_files + self.irrelevant_event_files:
+                self.paths[event_file.run_id] = event_file.path
+                self._analyze(event_file)
         self._finalize()
 
     def dump(self, path: os.PathLike, indent: Optional[int] = None):