Use LibSVM::Grammar for .load-problem

titsuki · Oct 21, 2019 · fb930fd · fb930fd
1 parent 523ca1d
commit fb930fd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/Algorithm/LibSVM.pm6 b/lib/Algorithm/LibSVM.pm6
@@ -63,11 +63,11 @@ method !_load-problem(\lines) {
 
     my $y-idx = 0;
     for lines -> $line {
-        my ($label, $features) = $line.trim.split(/\s+/,2);
-        my @feature-list = $features.split(/\s+/);
+        my $parsed = Algorithm::LibSVM::Grammar.parse($line, actions => Algorithm::LibSVM::Actions).made;
+        my ($label, $feature) = $parsed.head<label>, $parsed.head<pairs>;
 
         my $next = Algorithm::LibSVM::Node.new(index => -1, value => 0e0);
-        for @feature-list>>.split(":", :skip-empty).map({ .[0] => .[1] }).sort(-*.key).map({ .key, .value }) -> ($index, $value) {
+        for @($feature).sort(-*.key).map({ .key, .value }) -> ($index, $value) {
             $!nr-feature = ($!nr-feature, $index.Int).max;
             $next = Algorithm::LibSVM::Node.new(index => $index.Int, value => $value.Num, next => $next);
         }

diff --git a/t/01-basic.t b/t/01-basic.t
@@ -8,4 +8,8 @@ use Algorithm::LibSVM::Model;
     lives-ok { my $libsvm = Algorithm::LibSVM.new }, "Algorithm::LibSVM.new should create a instance";
 }
 
+{
+    lives-ok { my $libsvm = Algorithm::LibSVM.new.load-problem(("1 1:0 # comment",)) }, "Algorithm::LibSVM.load-problem should read lines include comments";
+}
+
 done-testing;