Move classifiers (#459)

* move classifiers to methods

* update changelog

Author: uremes

CHANGELOG.rst

@@ -1,6 +1,7 @@
 Changelog
 =========
 
+- Move classifiers
 - Fix readthedocs configuration
 - Update penalty to shrinkage parameter conversion in synthetic likelihood calculation
 - Update BSL pre sample methods

elfi/classifiers/__init__.py

@@ -7,11 +7,11 @@
 import numpy as np
 
 import elfi.methods.mcmc as mcmc
-from elfi.classifiers.classifier import Classifier, LogisticRegression
 from elfi.loader import get_sub_seed
 from elfi.methods.bo.acquisition import LCBSC, AcquisitionBase
 from elfi.methods.bo.gpy_regression import GPyRegression
 from elfi.methods.bo.utils import CostFunction
+from elfi.methods.classifier import Classifier, LogisticRegression
 from elfi.methods.inference.parameter_inference import ModelBased
 from elfi.methods.posteriors import BOLFIREPosterior
 from elfi.methods.results import BOLFIRESample

elfi/classifiers/classifier.py elfi/methods/classifier.py

@@ -3,8 +3,8 @@
 import numpy as np
 
 import elfi
-from elfi.classifiers.classifier import LogisticRegression
 from elfi.methods.bo.acquisition import LCBSC
+from elfi.methods.classifier import LogisticRegression
 from elfi.model.extensions import ModelPrior
 
 

elfi/methods/inference/bolfire.py

@@ -1,6 +1,6 @@
 import numpy as np
 
-from elfi.classifiers.classifier import GPClassifier, LogisticRegression
+from elfi.methods.classifier import GPClassifier, LogisticRegression
 
 
 def make_train_data(seed=270622):