Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 1 addition & 31 deletions lrmodule/__init__.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
import pickle
from pathlib import Path

import numpy as np
from lir.config.lrsystem_architectures import specific_source
from lir.data.models import FeatureData, LLRData
from lir.data.models import FeatureData
from lir.datasets.feature_data_csv import FeatureDataCsvFileParser
from lir.lrsystems.lrsystems import LRSystem

from lrmodule import persistence
from lrmodule.data_types import ModelSettings
from lrmodule.lrsystem import get_trained_model


def get_lr_system(lr_system_folder: Path, file_name: str = "model.pkl") -> LRSystem:
"""
Expand Down Expand Up @@ -55,31 +50,6 @@ def get_reference_data(lr_system_folder: Path, file_name: str = "reference_data.
return FeatureDataCsvFileParser(file=reference_data_file, label_column="hypothesis").get_instances()


def get_model(settings: ModelSettings, training_data: FeatureData, model_storage_path: Path | None) -> LRSystem:
"""
Obtain a model by loading it from disk, or by fitting it from training data.

:param settings: model settings
:param training_data: training data
:param model_storage_path: path where trained LR models are stored
:return: a fitted LR system
"""
model = None if not model_storage_path else persistence.load_model(settings, model_storage_path)
if not model:
model = get_trained_model(settings, training_data)
if model_storage_path:
persistence.save_model(model, settings, model_storage_path)
return model


def calculate_llrs(
features: np.ndarray, settings: ModelSettings, training_data: FeatureData, model_storage_path: Path | None
) -> LLRData:
"""Calculate LLRs after fitting a model with a training set."""
model = get_model(settings, training_data, model_storage_path)
return model.apply(FeatureData(features=features))


# create an alias for the specific source system, since the architecture is identical but the name is misleading
# in the current application
binary_lrsystem = specific_source
37 changes: 0 additions & 37 deletions lrmodule/lrsystem.py

This file was deleted.

46 changes: 0 additions & 46 deletions lrmodule/persistence.py

This file was deleted.

Empty file removed lrmodule/resources/__init__.py
Empty file.
11 changes: 0 additions & 11 deletions lrmodule/resources/lrsystem_firing_pin_impression_accf.yaml

This file was deleted.

95 changes: 0 additions & 95 deletions tests/characterization_test/characterization_test.py

This file was deleted.

Loading
Loading