Skip to content
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.

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

Remove buggy and uncessary crossval class #41

Merged
merged 1 commit into from
Nov 25, 2023
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 0.2.22 (dev):
* Bugfix: The NUSEF dataset scaled some fixations not correctly to image coordinates. Also, we now account for some typos in the
dataset source data.
* Feature: CrossvalMultipleRegularizations, CrossvalGoldMultipleRegularizations and GeneralMixtureKernelDensityEstimator in baseline utils (names might change!)
* Feature: CrossvalMultipleRegularizations and GeneralMixtureKernelDensityEstimator in baseline utils (names might change!)
* Feature: DVAAwareScanpathModel
* Feature: ShuffledBaselineModel is now much more efficient and able to handle large numbers of stimuli.
hence, ShuffledSimpleBaselineModel is not necessary anymore and a deprecated alias to ShuffledBaselineModel
Expand Down
10 changes: 0 additions & 10 deletions pysaliency/baseline_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -417,16 +417,6 @@ def score(self, log_bandwidth, *args, **kwargs):
return val


class CrossvalGoldMultipleRegularizations(CrossvalMultipleRegularizations):
def __init__(self, stimuli, fixations, regularization_models, n_jobs=None, verbose=False):
if fixations.subject_count > 1:
crossvalidation_factory = ScikitLearnImageSubjectCrossValidationGenerator
else:
crossvalidation_factory = ScikitLearnWithinImageCrossValidationGenerator

super().__init__(stimuli, fixations, regularization_models, crossvalidation_factory=crossvalidation_factory, n_jobs=n_jobs, verbose=verbose)


# baseline models

class GoldModel(Model):
Expand Down
Loading