Skip to content

Commit

Permalink
Merge pull request fastai#209 from PiotrCzapla/master
Browse files Browse the repository at this point in the history
Moved method that depends on self.y to the class that has it
  • Loading branch information
jph00 authored Mar 14, 2018
2 parents bc71ee9 + 74421ae commit e289135
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions fastai/dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -211,14 +211,9 @@ class FilesDataset(BaseDataset):
def __init__(self, fnames, transform, path):
self.path,self.fnames = path,fnames
super().__init__(transform)
def get_n(self): return len(self.y)
def get_sz(self): return self.transform.sz
def get_x(self, i): return open_image(os.path.join(self.path, self.fnames[i]))

def resize_imgs(self, targ, new_path):
dest = resize_imgs(self.fnames, targ, self.path, new_path)
return self.__class__(self.fnames, self.y, self.transform, dest)

def denorm(self,arr):
"""Reverse the normalization done to a batch of images.
Expand All @@ -234,10 +229,14 @@ def __init__(self, fnames, y, transform, path):
self.y=y
assert(len(fnames)==len(y))
super().__init__(fnames, transform, path)
def get_n(self): return len(self.y)
def get_y(self, i): return self.y[i]
def get_c(self):
return self.y.shape[1] if len(self.y.shape)>1 else 0

def resize_imgs(self, targ, new_path):
dest = resize_imgs(self.fnames, targ, self.path, new_path)
return self.__class__(self.fnames, self.y, self.transform, dest)

class FilesIndexArrayDataset(FilesArrayDataset):
def get_c(self): return int(self.y.max())+1
Expand Down

0 comments on commit e289135

Please sign in to comment.