solve merge

2024-10-29 08:14:43 +00:00
parent 9e39c6c6c9 63a246c0c8
commit b13e45bafc
5 changed files with 33 additions and 37 deletions
--- a/runners/strategy_generator.py
+++ b/runners/strategy_generator.py
@@ -93,18 +93,8 @@ class StrategyGenerator(Runner):
                else:
                    nrm = np.load(nrm_path)
                nrm_list.append(nrm)
-<<<<<<< HEAD
-            
            pts_list.append(pts)
-            
            indices = np.load(idx_path) 
-            
-=======
-                
-            indices = np.load(idx_path) 
-            pts_list.append(pts)
-            
->>>>>>> a883a31968b668a26545f2e8766179365308b0e2
            scan_points_indices_list.append(indices)
            if pts.shape[0] > 0:
                non_zero_cnt += 1