Merge 76a8f6c into d0ba69a

englhardt · Nov 5, 2018 · 78ac892 · 78ac892
2 parents d0ba69a + 76a8f6c
commit 78ac892
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,8 +7,6 @@ julia:
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - julia: 1.0
 
 notifications:
   email: false

diff --git a/src/classifiers/classifier.jl b/src/classifiers/classifier.jl
@@ -51,7 +51,7 @@ end
 is_K_adjusted(model)::Bool = model.adjust_K
 
 function update_K!(model)
-    updated_K = MLKernels.kernelmatrix(MLKernels.ColumnMajor(), model.kernel_fct, model.data)
+    updated_K = MLKernels.kernelmatrix(Val(:col), model.kernel_fct, model.data)
     if !isdefined(model, :K) || updated_K != model.K || (!isdefined(model, :K_adjusted) && model.adjust_K)
         debug(LOGGER, "[UPDATE_K] Updating Kernel matrix.")
         invalidate_solution!(model)

diff --git a/src/init_strategies/strategies_C.jl b/src/init_strategies/strategies_C.jl
@@ -46,7 +46,7 @@ function calculate_C(model, strategy::BinarySearchCStrategy, kernel)
     debug(LOGGER, "[BINARY_SEARCH] Search parameters: C_min = $(C_min), C_max = $(C_max), max_iter = $(strategy.max_iter).")
 
     m = deepcopy(model)
-    init_strategy = SVDD.FixedParameterInitialization(GaussianKernel(kernel), C_current)
+    init_strategy = SVDD.FixedParameterInitialization(kernel, C_current)
     SVDD.initialize!(m, init_strategy)
 
     while true

diff --git a/src/init_strategies/strategies_combined.jl b/src/init_strategies/strategies_combined.jl
@@ -20,6 +20,6 @@ end
 
 function get_parameters(model, strategy::GammaFirstCombinedStrategy)
     gamma = calculate_gamma(model, strategy.gamma_strategy)
-    C = calculate_C(model, strategy.C_strategy, gamma)
+    C = calculate_C(model, strategy.C_strategy, MLKernels.GaussianKernel(gamma))
     return (C, MLKernels.GaussianKernel(gamma))
 end
diff --git a/src/init_strategies/strategies_gamma.jl b/src/init_strategies/strategies_gamma.jl
@@ -1,10 +1,10 @@
 abstract type InitializationStrategyGamma <: InitializationStrategy end
 
 struct FixedGammaStrategy <: InitializationStrategyGamma
-    kernel::Kernel
+    kernel::SquaredExponentialKernel
 end
 
-calculate_gamma(model, strategy::FixedGammaStrategy) = strategy.kernel
+calculate_gamma(model, strategy::FixedGammaStrategy) = MLKernels.getvalue(strategy.kernel.alpha)
 
 """
 Original publication:

diff --git a/test/classifiers/classifier_svdd_neg_test.jl b/test/classifiers/classifier_svdd_neg_test.jl
@@ -50,7 +50,7 @@
         SVDD.fit!(svdd_neg, TEST_SOLVER)
         predictions = SVDD.predict(svdd_neg, dummy_data)
         @test sum(predictions .> 0) == 0
-        pools[labels .== "outlier"] = :Lout
+        pools[labels .== "outlier"] .= :Lout
 
         SVDD.set_pools!(svdd_neg, pools)
         @test_throws SVDD.ModelStateException SVDD.predict(svdd_neg, dummy_data)
@@ -71,7 +71,7 @@
         expected = SVDD.predict(svdd_neg, dummy_data)
         @test sum(expected .> 0) > 0
 
-        pools[labels .== "inlier"] = :Lin
+        pools[labels .== "inlier"] .= :Lin
         SVDD.set_pools!(svdd_neg, pools)
 
         SVDD.fit!(svdd_neg, TEST_SOLVER)