# HG changeset patch
# User Pascal Lamblin <lamblinp@iro.umontreal.ca>
# Date 1235160526 18000
# Node ID 4837aee2235256b23895e82af218b908e40ea6df
# Parent  40cae12a9bb855636de754b887ab31ebd94f6c7c# Parent  14d22ca1c8b570949a1825136592af73f53fa2a6
merge

diff -r 14d22ca1c8b5 -r 4837aee22352 pylearn/algorithms/rbm.py
--- a/pylearn/algorithms/rbm.py	Fri Feb 13 13:22:26 2009 -0500
+++ b/pylearn/algorithms/rbm.py	Fri Feb 20 15:08:46 2009 -0500
@@ -11,7 +11,6 @@
 from ..datasets import make_dataset
 from .minimizer import make_minimizer
 from .stopper import make_stopper
-from ..dbdict.experiment import subdict
 
 class RBM(T.RModule):
 
@@ -76,7 +75,7 @@
 
 
 def train_rbm(state, channel=lambda *args, **kwargs:None):
-    dataset = make_dataset(**subdict_copy(state, prefix='dataset_'))
+    dataset = make_dataset(**state.dataset)
     train = dataset.train
 
     rbm_module = RBM(
diff -r 14d22ca1c8b5 -r 4837aee22352 pylearn/external/wrap_libsvm.py
--- a/pylearn/external/wrap_libsvm.py	Fri Feb 13 13:22:26 2009 -0500
+++ b/pylearn/external/wrap_libsvm.py	Fri Feb 20 15:08:46 2009 -0500
@@ -2,7 +2,6 @@
 """
 import numpy
 from ..datasets import make_dataset
-from ..dbdict.experiment import subdict_copy
 
 # libsvm currently has no python installation instructions/convention.
 #
@@ -55,8 +54,7 @@
     This is the kind of function that dbdict-run can use.
 
     """
-    dataset = make_dataset(**subdict_copy(state, 'dataset_'))
-            
+    dataset = make_dataset(**state.dataset)
 
 
     #libsvm needs stuff in int32 on a 32bit machine