Updated swissroll and hemisphere graphical NLDR examples

shogun-toolbox · Sep 26, 2011 · 2a16c52 · 2a16c52
1 parent cf86e1b
commit 2a16c52
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/examples/undocumented/python_modular/graphical/hemisphere.py b/examples/undocumented/python_modular/graphical/hemisphere.py
@@ -23,11 +23,13 @@
 cisomap.set_k(9)
 preprocs.append((cisomap,"Isomap with k=%d" % cisomap.get_k()))
 
-lisomap = Isomap()
-lisomap.set_landmark(True)
-lisomap.set_landmark_number(500)
-lisomap.set_k(9)
-preprocs.append((lisomap,"Landmark Isomap with k=%d, %d landmarks" % (lisomap.get_k(),lisomap.get_landmark_number())))
+from shogun.Preprocessor import DiffusionMaps
+from shogun.Kernel import GaussianKernel
+dm = DiffusionMaps()
+dm.set_t(20)
+kernel = GaussianKernel(100,1.0)
+dm.set_kernel(kernel)
+preprocs.append((dm,"Diffusion Maps with t=%d, sigma=%f" % (dm.get_t(),kernel.get_width())))
 
 from shogun.Preprocessor import HessianLocallyLinearEmbedding
 hlle = HessianLocallyLinearEmbedding()

diff --git a/examples/undocumented/python_modular/graphical/swissroll.py b/examples/undocumented/python_modular/graphical/swissroll.py
@@ -24,11 +24,13 @@
 cisomap.set_k(9)
 preprocs.append((cisomap,"Isomap with k=%d" % cisomap.get_k()))
 
-lisomap = Isomap()
-lisomap.set_landmark(True)
-lisomap.set_landmark_number(20)
-lisomap.set_k(9)
-preprocs.append((lisomap,"Landmark Isomap with k=%d, %d landmarks" % (lisomap.get_k(),lisomap.get_landmark_number())))
+from shogun.Preprocessor import DiffusionMaps
+from shogun.Kernel import GaussianKernel
+dm = DiffusionMaps()
+dm.set_t(20)
+kernel = GaussianKernel(100,1.0)
+dm.set_kernel(kernel)
+preprocs.append((dm,"Diffusion Maps with t=%d, sigma=%f" % (dm.get_t(),kernel.get_width())))
 
 from shogun.Preprocessor import HessianLocallyLinearEmbedding
 hlle = HessianLocallyLinearEmbedding()