From 5e023c606a4118bacfec7d1aa3bbfa455b981630 Mon Sep 17 00:00:00 2001 From: Ralf Biedert Date: Sat, 14 Dec 2024 17:03:54 +0100 Subject: [PATCH] Reactivate more tests. --- tests/svm_dense_class.rs | 2 -- tests/svm_sparse_class.rs | 14 ++++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/tests/svm_dense_class.rs b/tests/svm_dense_class.rs index 4db7bdc..09f4e37 100644 --- a/tests/svm_dense_class.rs +++ b/tests/svm_dense_class.rs @@ -43,7 +43,6 @@ mod svm_dense_class { test_model!(m_csvm_rbf_prob, "m_csvm_rbf_prob.libsvm", true, [0, 7], [2, 7]); // apparently `libSVM` gets this wrong test_model!(m_csvm_sigmoid_prob, "m_csvm_sigmoid_prob.libsvm", true, [0, 5], [0, 7]); // apparently `libSVM` gets this wrong - // Temporarily disabled as they trigger ICE in Rust Nightly test_model!(m_csvm_linear, "m_csvm_linear.libsvm", false, [0, 7], [0, 0]); test_model!(m_csvm_poly, "m_csvm_poly.libsvm", false, [0, 7], [0, 0]); test_model!(m_csvm_rbf, "m_csvm_rbf.libsvm", false, [0, 7], [0, 0]); @@ -55,7 +54,6 @@ mod svm_dense_class { test_model!(m_nusvm_rbf_prob, "m_nusvm_rbf_prob.libsvm", true, [0, 7], [0, 7]); test_model!(m_nusvm_sigmoid_prob, "m_nusvm_sigmoid_prob.libsvm", true, [0, 7], [0, 7]); - // Temporarily disabled as they trigger ICE in Rust Nightly test_model!(m_nusvm_linear, "m_nusvm_linear.libsvm", false, [0, 7], [0, 0]); test_model!(m_nusvm_poly, "m_nusvm_poly.libsvm", false, [0, 7], [0, 0]); test_model!(m_nusvm_rbf, "m_nusvm_rbf.libsvm", false, [0, 7], [0, 0]); diff --git a/tests/svm_sparse_class.rs b/tests/svm_sparse_class.rs index 7dd9552..7bd0b6f 100644 --- a/tests/svm_sparse_class.rs +++ b/tests/svm_sparse_class.rs @@ -68,15 +68,13 @@ mod svm_sparse_class { test_model!(m_csvm_linear, "m_csvm_linear.libsvm", false, [0, 7], [0, 0]); test_model!(m_csvm_poly, "m_csvm_poly.libsvm", false, [0, 7], [0, 0]); test_model!(m_csvm_rbf, "m_csvm_rbf.libsvm", false, [0, 7], [0, 0]); - // TODO: Why do these fail? - // test_model!(m_csvm_sigmoid, "m_csvm_sigmoid.libsvm", false, [0, 5], [0, 0]); + test_model!(m_csvm_sigmoid, "m_csvm_sigmoid.libsvm", false, [0, 7], [0, 0]); - // NUSVM - // TODO: Why do these fail? - // test_model!(m_nusvm_linear_prob, "m_nusvm_linear_prob.libsvm", true, [0, 7], [1, 6]); - // test_model!(m_nusvm_poly_prob, "m_nusvm_poly_prob.libsvm", true, [0, 7], [0, 7]); - // test_model!(m_nusvm_rbf_prob, "m_nusvm_rbf_prob.libsvm", true, [0, 7], [0, 7]); - // test_model!(m_nusvm_sigmoid_prob, "m_nusvm_sigmoid_prob.libsvm", true, [0, 7], [0, 7]); + // NUSVM - TODO: Why do these actually differ between sparse and dense even in libSVM?! + test_model!(m_nusvm_linear_prob, "m_nusvm_linear_prob.libsvm", true, [0, 7], [0, 6]); + test_model!(m_nusvm_poly_prob, "m_nusvm_poly_prob.libsvm", true, [0, 7], [0, 5]); + test_model!(m_nusvm_rbf_prob, "m_nusvm_rbf_prob.libsvm", true, [0, 7], [0, 6]); + test_model!(m_nusvm_sigmoid_prob, "m_nusvm_sigmoid_prob.libsvm", true, [0, 7], [0, 6]); // Temporarily disabled as they trigger ICE in Rust Nightly test_model!(m_nusvm_linear, "m_nusvm_linear.libsvm", false, [0, 7], [0, 0]);