# HG changeset patch
# User James Bergstra <bergstrj@iro.umontreal.ca>
# Date 1232231897 18000
# Node ID d0f7a6f87adcfd1e940a0fb57edc6fbfb7bac135
# Parent  a88ead1a153740fddd5a003ec49939d460eae9f4# Parent  f6c74f34cd3539394d963a21eb3f9e301b2fbed3
merge

diff -r a88ead1a1537 -r d0f7a6f87adc pylearn/datasets/flickr.py
--- a/pylearn/datasets/flickr.py	Sat Jan 17 17:37:55 2009 -0500
+++ b/pylearn/datasets/flickr.py	Sat Jan 17 17:38:17 2009 -0500
@@ -7,11 +7,7 @@
 import numpy
 
 from ..io import filetensor
-if 0:
-    from .config import data_root
-else:
-    def data_root():
-        return '/u/lisa/db/flickr/filetensor'
+from .config import data_root
 from .dataset import Dataset
 
 
@@ -25,7 +21,7 @@
     """Return the basic flickr image classification problem.
     The images are 75x75, and there are 7500 training examples.
     """
-    root = data_root() if folder is None else folder
+    root = os.path.join(data_root(), 'flickr') if folder is None else folder
     train = filetensor.read(open(os.path.join(root, path_train_10class)))
     valid = filetensor.read(open(os.path.join(root, path_valid_10class)))
     test = filetensor.read(open(os.path.join(root, path_test_10class)))