-
-
Notifications
You must be signed in to change notification settings - Fork 184
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
Correct SVM Use #346
Correct SVM Use #346
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -79,6 +79,7 @@ public function __construct( | |
new ExtensionIsLoaded('svm'), | ||
new ExtensionMinimumVersion('svm', '0.2.0'), | ||
])->check(); | ||
|
||
|
||
if ($nu < 0.0 or $nu > 1.0) { | ||
throw new InvalidArgumentException('Nu must be between' | ||
|
@@ -182,7 +183,14 @@ public function train(Dataset $dataset) : void | |
new SamplesAreCompatibleWithEstimator($dataset, $this), | ||
])->check(); | ||
|
||
$this->model = $this->svm->train($dataset->samples()); | ||
$data = []; | ||
|
||
foreach ($dataset->samples() as $sample) { | ||
array_unshift($sample, 1); | ||
$data[] = $sample; | ||
} | ||
|
||
$this->model = $this->svm->train($data); | ||
} | ||
|
||
/** | ||
|
@@ -211,7 +219,13 @@ public function predictSample(array $sample) : int | |
throw new RuntimeException('Estimator has not been trained.'); | ||
} | ||
|
||
return $this->model->predict($sample) !== 1.0 ? 0 : 1; | ||
$sampleWithOffset = []; | ||
|
||
foreach ($sample as $key => $value) { | ||
$sampleWithOffset[$key + 1] = $value; | ||
} | ||
|
||
return $this->model->predict($sampleWithOffset) == 1 ? 0 : 1; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I notice we are "inversing" the logic here i.e. 1 is now 0, 0 is now 1. Is that intentional? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, in fact in the one class mode of libsvm, the "normal" samples are to be labelled with the 1 class. And the anomalies, are to be labelled with -1. That's why ! |
||
} | ||
|
||
/** | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So did array_unshift() turn out to be faster?
Is it necessary to assign the sample to an intermediate variable or would
work here as well?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is faster yes. And the rest works also, please see the next commit