Improved performance of merge_add and fixed output SEDs with duplicates

cschreib · cschreib · commit a28d957d3ecf · 2018-06-19T13:37:22.000+01:00
diff --git a/src/egg-utils.hpp b/src/egg-utils.hpp
@@ -39,7 +39,7 @@ void merge_add(const vec<1,TX1>& x1, const vec<1,TX2>& x2,
                 }
 
                 ++i1;
-            } else {
+            } else if (x1.safe[i1] > x2.safe[i2]) {
                 x.push_back(x2.safe[i2]);
 
                 if (i1 == 0) {
@@ -50,6 +50,12 @@ void merge_add(const vec<1,TX1>& x1, const vec<1,TX2>& x2,
                     ));
                 }
 
+                ++i2;
+            } else {
+                x.push_back(x1.safe[i1]);
+                y.push_back(y1.safe[i1] + y2.safe[i2]);
+
+                ++i1;
                 ++i2;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ void merge_add(const vec<1,TX1>& x1, const vec<1,TX2>& x2,`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`++i1;`
`42`		`- } else {`
	`42`	`+ } else if (x1.safe[i1] > x2.safe[i2]) {`
`43`	`43`	`x.push_back(x2.safe[i2]);`
`44`	`44`
`45`	`45`	`if (i1 == 0) {`
`@@ -50,6 +50,12 @@ void merge_add(const vec<1,TX1>& x1, const vec<1,TX2>& x2,`
`50`	`50`	`));`
`51`	`51`	`}`
`52`	`52`
	`53`	`+ ++i2;`
	`54`	`+ } else {`
	`55`	`+ x.push_back(x1.safe[i1]);`
	`56`	`+ y.push_back(y1.safe[i1] + y2.safe[i2]);`
	`57`	`+`
	`58`	`+ ++i1;`
`53`	`59`	`++i2;`
`54`	`60`	`}`
`55`	`61`	`}`