Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: remove repetitive folds in Z3Context #3006

Merged
merged 9 commits into from
Oct 4, 2024
Merged

refactor: remove repetitive folds in Z3Context #3006

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3e5e82c
remove repetitive folds
konnov Sep 27, 2024
a129dbe
Update tla-bmcmt/src/main/scala/at/forsyte/apalache/tla/bmcmt/smt/Z3S…
konnov Sep 30, 2024
3af5272
Merge branch 'main' into igor/z3-refactor-toExpr
konnov Sep 30, 2024
6ea1a5e
Merge branch 'main' into igor/z3-refactor-toExpr
coffeeinprogress Oct 1, 2024
0b49ed4
Merge branch 'main' into igor/z3-refactor-toExpr
coffeeinprogress Oct 1, 2024
4641262
Merge branch 'main' into igor/z3-refactor-toExpr
coffeeinprogress Oct 2, 2024
33c290f
Merge branch 'main' into igor/z3-refactor-toExpr
coffeeinprogress Oct 2, 2024
62f759a
Merge branch 'main' into igor/z3-refactor-toExpr
coffeeinprogress Oct 2, 2024
ac47a34
Merge branch 'main' into igor/z3-refactor-toExpr
coffeeinprogress Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions tla-bmcmt/src/main/scala/at/forsyte/apalache/tla/bmcmt/smt/Z3SolverContext.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,26 +767,17 @@ class Z3SolverContext(val config: SolverConfig) extends SolverContext with LazyL
case OperEx(ApalacheInternalOper.distinct, args @ _*) =>
val (es, ns) = (args.map(toExpr)).unzip
val distinct = z3context.mkDistinct(es: _*)
(distinct.asInstanceOf[ExprSort],
ns.foldLeft(1L) {
_ + _
})
(distinct.asInstanceOf[ExprSort], sumExprCount(ns))
konnov marked this conversation as resolved.
Show resolved Hide resolved

case OperEx(TlaBoolOper.and, args @ _*) =>
val (es, ns) = (args.map(toExpr)).unzip
val and = z3context.mkAnd(es.map(_.asInstanceOf[BoolExpr]): _*)
(and.asInstanceOf[ExprSort],
ns.foldLeft(1L) {
_ + _
})
(and.asInstanceOf[ExprSort], sumExprCount(ns))

case OperEx(TlaBoolOper.or, args @ _*) =>
val (es, ns) = (args.map(toExpr)).unzip
val or = z3context.mkOr(es.map(_.asInstanceOf[BoolExpr]): _*)
(or.asInstanceOf[ExprSort],
ns.foldLeft(1L) {
_ + _
})
(or.asInstanceOf[ExprSort], sumExprCount(ns))

case OperEx(TlaBoolOper.implies, lhs, rhs) =>
val (lhsZ3, ln) = toExpr(lhs)
Expand Down Expand Up @@ -1079,6 +1070,11 @@ class Z3SolverContext(val config: SolverConfig) extends SolverContext with LazyL
})
logger.info(entries.mkString(",") + "\n")
}

// sum up the number of expressions in the children, add 1 for self
private def sumExprCount(nexprInChildren: Seq[Long]): Long = {
nexprInChildren.foldLeft(1L) { _ + _ }
}
}

object Z3SolverContext {
Expand Down
Loading