Mercurial > ift6266
diff datasets/ftfile.py @ 219:cde71d24f235
Merge
author | fsavard |
---|---|
date | Wed, 10 Mar 2010 20:14:20 -0500 |
parents | 1faae5079522 |
children | 966272e7f14b |
line wrap: on
line diff
--- a/datasets/ftfile.py Wed Mar 10 20:13:45 2010 -0500 +++ b/datasets/ftfile.py Wed Mar 10 20:14:20 2010 -0500 @@ -193,12 +193,19 @@ if valid_data is None: total_valid_size = sum(FTFile(td).size for td in test_data) valid_size = total_valid_size/len(train_data) - self._train = FTData(train_data, train_lbl, size=-valid_size) - self._valid = FTData(train_data, train_lbl, skip=-valid_size) + self._train = FTData(train_data, train_lbl, size=-valid_size, + inscale=inscale, outscale=outscale, indtype=indtype, + outdtype=outdtype) + self._valid = FTData(train_data, train_lbl, skip=-valid_size, + inscale=inscale, outscale=outscale, indtype=indtype, + outdtype=outdtype) else: - self._train = FTData(train_data, train_lbl) - self._valid = FTData(valid_data, valid_lbl) - self._test = FTData(test_data, test_lbl) + self._train = FTData(train_data, train_lbl,inscale=inscale, + outscale=outscale, indtype=indtype, outdtype=outdtype) + self._valid = FTData(valid_data, valid_lbl,inscale=inscale, + outscale=outscale, indtype=indtype, outdtype=outdtype) + self._test = FTData(test_data, test_lbl,inscale=inscale, + outscale=outscale, indtype=indtype, outdtype=outdtype) def _return_it(self, batchsize, bufsize, ftdata): return izip(DataIterator(ftdata.open_inputs(), batchsize, bufsize),