Skip to content
Snippets Groups Projects
Commit 9f64ef68 authored by Danilo Ferreira de Lima's avatar Danilo Ferreira de Lima
Browse files

Included Nystroem's rank.

parent 3b1b5aa3
No related branches found
No related tags found
1 merge request!3Added kernel approximation with the Nystroem sub-space projection method as an alternative
...@@ -508,13 +508,13 @@ class Model(TransformerMixin, BaseEstimator): ...@@ -508,13 +508,13 @@ class Model(TransformerMixin, BaseEstimator):
tof_start: Optional[int]=None, tof_start: Optional[int]=None,
delta_tof: Optional[int]=300, delta_tof: Optional[int]=300,
validation_size: float=0.05, validation_size: float=0.05,
n_nonlinear_kernel: int=5000): n_nonlinear_kernel: int=10000):
# models # models
x_model_steps = list() x_model_steps = list()
x_model_steps += [('select', SelectRelevantLowResolution(channels, tof_start, delta_tof))] x_model_steps += [('select', SelectRelevantLowResolution(channels, tof_start, delta_tof))]
if n_nonlinear_kernel > 0: if n_nonlinear_kernel > 0:
x_model_steps += [('fex', Pipeline([('prepca', PCA(n_pca_lr, whiten=True)), x_model_steps += [('fex', Pipeline([('prepca', PCA(n_pca_lr, whiten=True)),
('nystroem', Nystroem(n_components=n_nonlinear_kernel, kernel='rbf', gamma=None, n_jobs=-1)), ('nystroem', Nystroem(n_components=n_nonlinear_kernel, kernel='rbf', gamma=None, n_jobs=8)),
]))] ]))]
x_model_steps += [ x_model_steps += [
('pca', PCA(n_pca_lr, whiten=True)), ('pca', PCA(n_pca_lr, whiten=True)),
...@@ -527,7 +527,7 @@ class Model(TransformerMixin, BaseEstimator): ...@@ -527,7 +527,7 @@ class Model(TransformerMixin, BaseEstimator):
('unc', UncertaintyHolder()), ('unc', UncertaintyHolder()),
]) ])
#self.fit_model = FitModel() #self.fit_model = FitModel()
self.fit_model = MultiOutputWithStd(ARDRegression(n_iter=30, verbose=True)) self.fit_model = MultiOutputWithStd(ARDRegression(n_iter=30, tol=1e-4, verbose=True))
# size of the test subset # size of the test subset
self.validation_size = validation_size self.validation_size = validation_size
......
#!/usr/bin/env python #!/usr/bin/env python
import sys import sys
sys.path.append('.')
sys.path.append('..') sys.path.append('..')
import numpy as np import numpy as np
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment