Fix conflicts

Author: shubham1810

src/metrics.py

@@ -1,23 +1,6 @@
 from pykdtree.kdtree import KDTree
 import numpy as np
 
-pc_path1 = '/home/madhvi/Documents/CV Project/data/subset/ShapeNet/02691156/1ac29674746a0fc6b87697d3904b168b/pointcloud.npz'
-pc_path2 = '/home/madhvi/Documents/CV Project/data/subset/ShapeNet/02691156/1ac29674746a0fc6b87697d3904b168b/pointcloud.npz'
-point_path1 = '/home/madhvi/Documents/CV Project/data/subset/ShapeNet/02691156/1ac29674746a0fc6b87697d3904b168b/points.npz'
-point_path2 = '/home/madhvi/Documents/CV Project/data/subset/ShapeNet/02691156/1ac29674746a0fc6b87697d3904b168b/points.npz'
-
-pc_data1 = np.load(pc_path1)
-pc_data2 = np.load(pc_path2)
-points_data1 = np.load(point_path1)
-points_data2 = np.load(point_path2)
-
-pointcloud = pc_data1['points']
-pointcloud_gt = pc_data2['points']
-normals = pc_data1['normals']
-normals_gt = pc_data2['normals']
-occ_1 = points_data1['occupancies']
-occ_2 = points_data2['occupancies']
-
 
 def compute_iou(occ1, occ2):
     ''' Computes the Intersection over Union (IoU) value for two sets of
@@ -155,5 +138,22 @@ def eval_pointcloud(pointcloud, pointcloud_gt,
         return out_dict
 
 if __name__ == '__main__':
+	pc_path1 = '/home/madhvi/Documents/CV Project/data/subset/ShapeNet/02691156/1ac29674746a0fc6b87697d3904b168b/pointcloud.npz'
+	pc_path2 = '/home/madhvi/Documents/CV Project/data/subset/ShapeNet/02691156/1ac29674746a0fc6b87697d3904b168b/pointcloud.npz'
+	point_path1 = '/home/madhvi/Documents/CV Project/data/subset/ShapeNet/02691156/1ac29674746a0fc6b87697d3904b168b/points.npz'
+	point_path2 = '/home/madhvi/Documents/CV Project/data/subset/ShapeNet/02691156/1ac29674746a0fc6b87697d3904b168b/points.npz'
+
+	pc_data1 = np.load(pc_path1)
+	pc_data2 = np.load(pc_path2)
+	points_data1 = np.load(point_path1)
+	points_data2 = np.load(point_path2)
+
+	pointcloud = pc_data1['points']
+	pointcloud_gt = pc_data2['points']
+	normals = pc_data1['normals']
+	normals_gt = pc_data2['normals']
+	occ_1 = points_data1['occupancies']
+	occ_2 = points_data2['occupancies']
+
 	eval_dict = eval_pointcloud(pointcloud, pointcloud_gt, normals, normals_gt, occ_1, occ_2)
-	print(eval_dict)
+	print(eval_dict)