Merge pull request #392 from pluskid/master

The filenames for two example code are wrong
shogun-toolbox · Mar 26, 2012 · 16be749 · 16be749
2 parents defc6b5 + 5ac7522
commit 16be749
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/examples/undocumented/matlab_and_octave/clustering_hierarchical.m b/examples/undocumented/matlab_and_octave/clustering_hierarchical.m
@@ -1,15 +1,14 @@
 addpath('tools');
 fm_train=load_matrix('../data/fm_train_real.dat');
 
-% KMEANS
-disp('KMeans');
+% Hierarchical
+disp('Hierarchical');
 
-k=3;
-iter=1000;
+merges=3;
 
 sg('set_features', 'TRAIN', fm_train);
 sg('set_distance', 'EUCLIDIAN', 'REAL');
-sg('new_clustering', 'KMEANS');
+sg('new_clustering', 'HIERARCHICAL');
 
-sg('train_clustering', k, iter);
-[radi, centers]=sg('get_clustering');
+sg('train_clustering', merges);
+[merge_distance, pairs]=sg('get_clustering');
diff --git a/examples/undocumented/matlab_and_octave/clustering_kmeans.m b/examples/undocumented/matlab_and_octave/clustering_kmeans.m
@@ -1,14 +1,15 @@
 addpath('tools');
 fm_train=load_matrix('../data/fm_train_real.dat');
 
-% Hierarchical
-disp('Hierarchical');
+% KMEANS
+disp('KMeans');
 
-merges=3;
+k=3;
+iter=1000;
 
 sg('set_features', 'TRAIN', fm_train);
 sg('set_distance', 'EUCLIDIAN', 'REAL');
-sg('new_clustering', 'HIERARCHICAL');
+sg('new_clustering', 'KMEANS');
 
-sg('train_clustering', merges);
-[merge_distance, pairs]=sg('get_clustering');
+sg('train_clustering', k, iter);
+[radi, centers]=sg('get_clustering');