# HG changeset patch
# User Frederic Bastien <bastienf@iro.umontreal.ca>
# Date 1213735653 14400
# Node ID 7545207466d4f103970fd3e2c40b194d89c3fef3
# Parent  ae6605eccd09a3b1be97d0f24546c4834f33c275
debugged RenamedFieldsDataSet

diff -r ae6605eccd09 -r 7545207466d4 dataset.py
--- a/dataset.py	Tue Jun 17 16:20:17 2008 -0400
+++ b/dataset.py	Tue Jun 17 16:47:33 2008 -0400
@@ -692,6 +692,7 @@
         assert len(src_fieldnames)==len(new_fieldnames)
         self.valuesHStack = src.valuesHStack
         self.valuesVStack = src.valuesVStack
+        self.lookup_fields = Example(new_fieldnames,src_fieldnames)
 
     def __len__(self): return len(self.src)
     
@@ -719,7 +720,11 @@
 
     def minibatches_nowrap(self,fieldnames,minibatch_size,n_batches,offset):
         assert self.hasFields(*fieldnames)
-        return self.src.minibatches_nowrap(fieldnames,minibatch_size,n_batches,offset)
+        cursor = Example(fieldnames,[0]*len(fieldnames))
+        for batch in self.src.minibatches_nowrap([self.lookup_fields[f] for f in fieldnames],minibatch_size,n_batches,offset):
+            cursor._values=batch._values
+            yield cursor
+    
     def __getitem__(self,i):
 #        return FieldsSubsetDataSet(self.src[i],self.new_fieldnames)
         complete_example = self.src[i]