bounded by &ub

conjure-cp · Apr 23, 2024 · f878ba5 · f878ba5
1 parent 8f79eff
commit f878ba5
Show file tree

Hide file tree

Showing 2 changed files with 282 additions and 282 deletions.
diff --git a/src/Conjure/Process/Streamlining.hs b/src/Conjure/Process/Streamlining.hs
@@ -379,7 +379,7 @@ matrixByRowBucket innerStreamliner x = do
             concatForM [0..9] $ \ (bucketInt :: Integer) -> let bucket = fromInt bucketInt in
                 forM innerConstraints $ \ (innerConstraint, grps) ->
                     attachGroup (("MatrixByRowBucket-" ++ show bucketInt) : grps) [essence|
-                        forAll &pat : int(&lb + &bucket * &bucketSize .. &lb + (&bucket+1) * &bucketSize) . &innerConstraint
+                        forAll &pat : int(&lb + &bucket * &bucketSize .. min([&ub, &lb + (&bucket+1) * &bucketSize])) . &innerConstraint
                         |]
         _ -> noStreamliner
 
@@ -413,7 +413,7 @@ matrixByColBucket innerStreamliner x = do
                 forM innerConstraints $ \ (innerConstraint, grps) ->
                     attachGroup (("MatrixByColBucket-" ++ show bucketInt) : grps) [essence|
                         forAll &patO : &outerIndex .
-                        forAll &pat : int(&lb + &bucket * &bucketSize .. &lb + (&bucket+1) * &bucketSize) .
+                        forAll &pat : int(&lb + &bucket * &bucketSize .. min([&ub, &lb + (&bucket+1) * &bucketSize])) .
                         &innerConstraint
                         |]
         _ -> noStreamliner