Skip to content

Feature ml patch #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Sep 17, 2024
Merged

Feature ml patch #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cdc1477
adds scalar, makes demo config config more helpful
henry-wallace-phys Sep 17, 2024
9f4e74d
more config updates
henry-wallace-phys Sep 17, 2024
85b3be6
Adds basic version of diagnostics package from T2K MaCh3, will not wo…
henry-wallace-phys Sep 17, 2024
129deb5
update gitignore
henry-wallace-phys Sep 17, 2024
8b50de7
Implements plotting lib
henry-wallace-phys Sep 17, 2024
2f21803
Small patches'
henry-wallace-phys Sep 17, 2024
f315a9c
More small fixes to naming
henry-wallace-phys Sep 17, 2024
bce079a
EVEN MORE REQUIREMENTS
henry-wallace-phys Sep 17, 2024
ea99fc5
Switch off deprecation warning
henry-wallace-phys Sep 17, 2024
31013c0
Oops summary diags
henry-wallace-phys Sep 17, 2024
0acfcfa
Oops, fixes name change
henry-wallace-phys Sep 17, 2024
aa4c8cd
Merge branch 'main' into feature_ml_patch
henry-wallace-phys Sep 17, 2024
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
1 change: 0 additions & 1 deletion MaCh3PythonUtils/machine_learning/fml_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from sklearn import metrics
from sklearn.preprocessing import StandardScaler
import matplotlib.pyplot as plt
import scipy.stats as stats
import numpy as np

import pickle
Expand Down
4 changes: 2 additions & 2 deletions MaCh3PythonUtils/machine_learning/ml_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ def __setup_package_factory(self, package: str, algorithm: str, **kwargs):

return self.__IMPLEMENTED_ALGORITHMS[package][algorithm](*kwargs)

def setup_scikit_model(self, algorithm: str, **kwargs)->SciKitInterface:
def make_scikit_model(self, algorithm: str, **kwargs)->SciKitInterface:
# Simple wrapper for scikit packages
interface = SciKitInterface(self._chain, self._prediction_variable)
interface.add_model(self.__setup_package_factory(package="scikit", algorithm=algorithm, **kwargs))
return interface

def setup_tensorflow_model(self, algorithm: str, **kwargs):
def make_tensorflow_model(self, algorithm: str, **kwargs):
interface = TfInterface(self._chain, self._prediction_variable)

interface.add_model(self.__setup_package_factory(package="tensorflow", algorithm=algorithm))
Expand Down
1 change: 0 additions & 1 deletion configs/tensorflow_config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,3 @@ MLSettings:

FitSettings:
batch_size: 100
epochs: 200
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ arviz
mplhep
tqdm
numba
jinja2
jinja2