Skip to content
Snippets Groups Projects
Commit 405cf824 authored by Maciej Wielgosz's avatar Maciej Wielgosz
Browse files

config corrections

parent 584299f5
Branches
No related tags found
No related merge requests found
...@@ -25,7 +25,7 @@ def train(): ...@@ -25,7 +25,7 @@ def train():
return_cls_label=True, return_cls_label=True,
small_data=True, small_data=True,
small_data_size=300, small_data_size=300,
just_one_class=False, just_four_classes=False,
split='train', split='train',
norm=True norm=True
) )
......
...@@ -138,7 +138,7 @@ shapenet_data_train = ShapenetDataDgcnn( ...@@ -138,7 +138,7 @@ shapenet_data_train = ShapenetDataDgcnn(
return_cls_label=True, return_cls_label=True,
small_data=config['data']['small_data'], small_data=config['data']['small_data'],
small_data_size=config['data']['small_data_size'], small_data_size=config['data']['small_data_size'],
just_one_class=config['data']['just_one_class'], just_four_classes=config['data']['just_four_classes'],
split='train', split='train',
norm=config['data']['norm'], norm=config['data']['norm'],
augmnetation=config['data']['augmentation'] augmnetation=config['data']['augmentation']
...@@ -151,7 +151,7 @@ shapenet_data_val = ShapenetDataDgcnn( ...@@ -151,7 +151,7 @@ shapenet_data_val = ShapenetDataDgcnn(
return_cls_label=True, return_cls_label=True,
small_data=config['data']['small_data'], small_data=config['data']['small_data'],
small_data_size=config['data']['small_data_size'], small_data_size=config['data']['small_data_size'],
just_one_class=config['data']['just_one_class'], just_four_classes=config['data']['just_four_classes'],
split='test', split='test',
norm=config['data']['norm'] norm=config['data']['norm']
) )
...@@ -163,7 +163,7 @@ shapenet_data_test = ShapenetDataDgcnn( ...@@ -163,7 +163,7 @@ shapenet_data_test = ShapenetDataDgcnn(
return_cls_label=True, return_cls_label=True,
small_data=config['data']['small_data'], small_data=config['data']['small_data'],
small_data_size=config['data']['small_data_size'], small_data_size=config['data']['small_data_size'],
just_one_class=config['data']['just_one_class'], just_four_classes=config['data']['just_four_classes'],
split='test', split='test',
norm=config['data']['norm'] norm=config['data']['norm']
) )
......
...@@ -7,7 +7,7 @@ shapenet_data_train = ShapenetDataDgcnn( ...@@ -7,7 +7,7 @@ shapenet_data_train = ShapenetDataDgcnn(
return_cls_label=True, return_cls_label=True,
small_data=False, small_data=False,
small_data_size=1000, small_data_size=1000,
just_one_class=True, just_four_classes=True,
split='train', split='train',
norm=True norm=True
) )
...@@ -18,7 +18,7 @@ shapenet_data_test = ShapenetDataDgcnn( ...@@ -18,7 +18,7 @@ shapenet_data_test = ShapenetDataDgcnn(
return_cls_label=True, return_cls_label=True,
small_data=False, small_data=False,
small_data_size=1000, small_data_size=1000,
just_one_class=True, just_four_classes=True,
split='test', split='test',
norm=True norm=True
) )
...@@ -29,7 +29,7 @@ shapenet_data_val = ShapenetDataDgcnn( ...@@ -29,7 +29,7 @@ shapenet_data_val = ShapenetDataDgcnn(
return_cls_label=True, return_cls_label=True,
small_data=False, small_data=False,
small_data_size=1000, small_data_size=1000,
just_one_class=True, just_four_classes=True,
split='val', split='val',
norm=True norm=True
) )
......
...@@ -17,7 +17,7 @@ class ShapenetDataDgcnn(object): ...@@ -17,7 +17,7 @@ class ShapenetDataDgcnn(object):
small_data=False, small_data=False,
small_data_size=10, small_data_size=10,
return_cls_label=False, return_cls_label=False,
just_one_class=False, just_four_classes=False,
norm=False, norm=False,
augmnetation=False, augmnetation=False,
data_augmentation=False data_augmentation=False
...@@ -29,7 +29,7 @@ class ShapenetDataDgcnn(object): ...@@ -29,7 +29,7 @@ class ShapenetDataDgcnn(object):
self.small_data = small_data self.small_data = small_data
self.small_data_size = small_data_size self.small_data_size = small_data_size
self.return_cls_label = return_cls_label self.return_cls_label = return_cls_label
self.just_one_class = just_one_class self.just_four_classes = just_four_classes
self.norm = norm self.norm = norm
self.augmnetation = augmnetation self.augmnetation = augmnetation
self.data_augmentation = data_augmentation self.data_augmentation = data_augmentation
...@@ -83,8 +83,6 @@ class ShapenetDataDgcnn(object): ...@@ -83,8 +83,6 @@ class ShapenetDataDgcnn(object):
with open(json_file, 'r') as f: with open(json_file, 'r') as f:
data = json.load(f) data = json.load(f)
print('10 data in the list: ', data[:10])
out_data = [] out_data = []
for i in range(len(data)): for i in range(len(data)):
out_data.append(os.path.join(root, 'raw', os.path.join(data[i].split('/')[-2], data[i].split('/')[-1] + '.txt'))) out_data.append(os.path.join(root, 'raw', os.path.join(data[i].split('/')[-2], data[i].split('/')[-1] + '.txt')))
...@@ -92,7 +90,7 @@ class ShapenetDataDgcnn(object): ...@@ -92,7 +90,7 @@ class ShapenetDataDgcnn(object):
# get one class of data # get one class of data
# get the the number of the class airplane # get the the number of the class airplane
if self.just_one_class: if self.just_four_classes:
out_data = [x for x in out_data if x.split('/')[-2] in [ out_data = [x for x in out_data if x.split('/')[-2] in [
self.cat['Airplane'], self.cat['Airplane'],
self.cat['Lamp'], self.cat['Lamp'],
...@@ -100,8 +98,6 @@ class ShapenetDataDgcnn(object): ...@@ -100,8 +98,6 @@ class ShapenetDataDgcnn(object):
self.cat['Table'], self.cat['Table'],
]] ]]
print('10 data in the out_data list: ', out_data[:10])
return out_data return out_data
def get_seg_classes(self, cat): def get_seg_classes(self, cat):
...@@ -217,7 +213,7 @@ class ShapenetDataDgcnn(object): ...@@ -217,7 +213,7 @@ class ShapenetDataDgcnn(object):
class_name = self.test_file_list[index].split('/')[-2] class_name = self.test_file_list[index].split('/')[-2]
elif self.split == 'val': elif self.split == 'val':
class_name = self.val_data_file[index].split('/')[-2] class_name = self.val_data_file[index].split('/')[-2]
# apply the mapper # apply the mapper
class_name = self.class_mapper(class_name) class_name = self.class_mapper(class_name)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment