fixing constraint lookup

petergjoel · petergjoel · commit c5861eda6d78 · 2023-10-07T10:47:45.000+02:00
diff --git a/src/RefinementTree.cpp b/src/RefinementTree.cpp
@@ -88,13 +88,12 @@ namespace prlearn {
             }
         }
         else {
-            size_t j = 0;
             for(size_t i = 0; i < n_labels; ++i)
             {
+                size_t j = 0;
                 for(;j < _mapping.size() && _mapping[j]._label < next_labels[i]; ++j) {};
-                if(j >= _mapping.size()) return val;
-                if(_mapping[j]._label != next_labels[i])
-                    continue;
+                if(j >= _mapping.size()) continue;
+                if(_mapping[j]._label != next_labels[i]) continue;
                 const auto& res = _mapping[j];
                 auto node = _nodes[res._nid].get_leaf(point, res._nid, _nodes);
                 auto v = _nodes[node]._predictor._q.avg();

Original file line number	Diff line number	Diff line change
`@@ -88,13 +88,12 @@ namespace prlearn {`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`	`else {`
`91`		`- size_t j = 0;`
`92`	`91`	`for(size_t i = 0; i < n_labels; ++i)`
`93`	`92`	`{`
	`93`	`+ size_t j = 0;`
`94`	`94`	`for(;j < _mapping.size() && _mapping[j]._label < next_labels[i]; ++j) {};`
`95`		`- if(j >= _mapping.size()) return val;`
`96`		`- if(_mapping[j]._label != next_labels[i])`
`97`		`- continue;`
	`95`	`+ if(j >= _mapping.size()) continue;`
	`96`	`+ if(_mapping[j]._label != next_labels[i]) continue;`
`98`	`97`	`const auto& res = _mapping[j];`
`99`	`98`	`auto node = _nodes[res._nid].get_leaf(point, res._nid, _nodes);`
`100`	`99`	`auto v = _nodes[node]._predictor._q.avg();`