fixing test

jumutc · Sep 19, 2015 · 9232948 · 9232948
1 parent 2d1fef3
commit 9232948
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/algorithms/stochastic_rk_means.jl b/src/algorithms/stochastic_rk_means.jl
@@ -37,15 +37,17 @@ function stochastic_rk_means{A <: Algorithm}(X, rk_means::RK_MEANS{A}, alg_param
     end
 
     if isempty(train_idx)
-    	train_idx = 1:1:N
+    	X_ = sub(X,:,:)'
+    else
+        X_ = sub(X,train_idx,:)'
     end
 
     failed_mapping = false; t = 1; Y = ones(N)
 
     while true
-        dists = pairwise(rk_means.metric, sub(X,train_idx,:)', w)
+        dists = pairwise(rk_means.metric, X_, w)
         (x,y) = findn(dists .== minimum(dists,2))
-        mappings = zeros(length(train_idx))
+        mappings = zeros(size(X_,2))
         mappings[x] = y
         mappings
 
@@ -59,8 +61,7 @@ function stochastic_rk_means{A <: Algorithm}(X, rk_means::RK_MEANS{A}, alg_param
 
     	result = @parallel (hcat) for cluster_id in unique(mappings)
     		cluster_idx = find(mappings .== cluster_id)
-    		r = run_algorithm(rk_means.support_alg,X,Y,dfunc,alg_params,k,max_iter,tolerance,online_pass,cluster_idx)[1]
-            size(r) == (d,) ? r'' : r
+    		run_algorithm(rk_means.support_alg,X,Y,dfunc,alg_params,k,max_iter,tolerance,online_pass,cluster_idx)[1]
     	end
 
     	# assign and check the result of parallel execution

diff --git a/src/support/definitions.jl b/src/support/definitions.jl
@@ -5,5 +5,6 @@ sub(a::AbstractMatrix, I::AbstractVector, ::Colon) = a[I,:]
 sub(a::AbstractVector, I::AbstractVector, ::Colon) = a[I]
 sub(a::AbstractMatrix, i::Int, ::Colon) = a[i,:]
 sub(a::AbstractMatrix, ::Colon, ::Colon) = a
+sub(a::SparseMatrixCSC, ::Colon, ::Colon) = a
 view(a::SparseMatrixCSC, ::Colon, I::Int) = a[:,I]
 dot(a::SparseMatrixCSC, b::SparseMatrixCSC) = sum(a.*b)