From a6d0c01d4b7acbfbe76c2a3731eb6049d7cea147 Mon Sep 17 00:00:00 2001 From: Amir Date: Tue, 16 Jun 2026 00:07:50 -0500 Subject: [PATCH 1/2] Making the nested-ubd and farrow-ubd nicely diff-able --- examples/scala/README | 2 ++ examples/scala/farrow-ubd-driver.scala | 4 +++- examples/scala/farrow-ubd-fiber-driver.scala | 4 +++- examples/scala/nested-ubd-driver.scala | 5 +++-- examples/scala/nested-ubd-fiber-driver.scala | 5 +++-- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/examples/scala/README b/examples/scala/README index d1b455ad..5eee9d50 100644 --- a/examples/scala/README +++ b/examples/scala/README @@ -8,3 +8,5 @@ make EVALUATOR=STATIC Classic.run make EVALUATOR=STATIC TestCollDriver.run make EVALUATOR=STATIC TestUseCollDriver.run make EVALUATOR=STATIC NestedCyclesDriver.run +make EVALUATOR=STATIC ARGS="nested-ubd.program" NestedUbdDriver.run +make EVALUATOR=STATIC ARGS="nested-ubd.program" NestedUbdFiberDriver.run diff --git a/examples/scala/farrow-ubd-driver.scala b/examples/scala/farrow-ubd-driver.scala index bb055eb6..64187f61 100644 --- a/examples/scala/farrow-ubd-driver.scala +++ b/examples/scala/farrow-ubd-driver.scala @@ -16,9 +16,11 @@ object FarrowUbdDriver extends App { val m_farrow_ubd_tree = farrow_ubd_tree; val m_farrow_ubd = new M_FARROW_UBD[m_farrow_ubd_tree.T_Result]("FarrowUbd", m_farrow_ubd_tree.t_Result); - Debug.activate(); + // Debug.activate(); m_farrow_ubd_tree.finish(); m_farrow_ubd.finish(); + println("Results:"); + m_farrow_ubd.v_program_errs(m_farrow_ubd.t_Program.nodes(0)).toSeq.sorted.foreach(println); } diff --git a/examples/scala/farrow-ubd-fiber-driver.scala b/examples/scala/farrow-ubd-fiber-driver.scala index 0f29de7f..59cc7741 100644 --- a/examples/scala/farrow-ubd-fiber-driver.scala +++ b/examples/scala/farrow-ubd-fiber-driver.scala @@ -16,9 +16,11 @@ object FarrowUbdFiberDriver extends App { val m_farrow_ubd_tree = farrow_ubd_tree; val m_farrow_ubd = new M_FARROW_UBD_FIBER[m_farrow_ubd_tree.T_Result]("FarrowUbdFiber", m_farrow_ubd_tree.t_Result); - Debug.activate(); + // Debug.activate(); m_farrow_ubd_tree.finish(); m_farrow_ubd.finish(); + println("Results:"); + m_farrow_ubd.v_program_errs(m_farrow_ubd.t_Program.nodes(0)).toSeq.sorted.foreach(println); } diff --git a/examples/scala/nested-ubd-driver.scala b/examples/scala/nested-ubd-driver.scala index cbd62110..42b59919 100644 --- a/examples/scala/nested-ubd-driver.scala +++ b/examples/scala/nested-ubd-driver.scala @@ -16,10 +16,11 @@ object NestedUbdDriver extends App { val m_nested_ubd_tree = nested_ubd_tree; val m_nested_ubd = new M_NESTED_UBD[m_nested_ubd_tree.T_Result]("NestedUbd", m_nested_ubd_tree.t_Result); - Debug.activate(); + // Debug.activate(); m_nested_ubd_tree.finish(); m_nested_ubd.finish(); - println(m_nested_ubd.v_program_errs(m_nested_ubd.t_Program.nodes(0))); + println("Results:"); + m_nested_ubd.v_program_errs(m_nested_ubd.t_Program.nodes(0)).toSeq.sorted.foreach(println); } diff --git a/examples/scala/nested-ubd-fiber-driver.scala b/examples/scala/nested-ubd-fiber-driver.scala index 41d7c5ff..d742a0e0 100644 --- a/examples/scala/nested-ubd-fiber-driver.scala +++ b/examples/scala/nested-ubd-fiber-driver.scala @@ -16,10 +16,11 @@ object NestedUbdFiberDriver extends App { val m_nested_ubd_tree = nested_ubd_tree; val m_nested_ubd = new M_NESTED_UBD_FIBER[m_nested_ubd_tree.T_Result]("NestedUbdFiber", m_nested_ubd_tree.t_Result); - Debug.activate(); + // Debug.activate(); m_nested_ubd_tree.finish(); m_nested_ubd.finish(); - println(m_nested_ubd.v_messages); + println("Results:"); + m_nested_ubd.v_messages.toSeq.sorted.foreach(println); } From 14e135f17c2d117eb7b966a4324b422912ad510f Mon Sep 17 00:00:00 2001 From: Amir Hesamian Date: Tue, 16 Jun 2026 15:39:37 +0000 Subject: [PATCH 2/2] Set debug as argument --- examples/scala/farrow-ubd-driver.scala | 2 +- examples/scala/farrow-ubd-fiber-driver.scala | 2 +- examples/scala/nested-ubd-driver.scala | 2 +- examples/scala/nested-ubd-fiber-driver.scala | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/scala/farrow-ubd-driver.scala b/examples/scala/farrow-ubd-driver.scala index 64187f61..a4d4683c 100644 --- a/examples/scala/farrow-ubd-driver.scala +++ b/examples/scala/farrow-ubd-driver.scala @@ -16,7 +16,7 @@ object FarrowUbdDriver extends App { val m_farrow_ubd_tree = farrow_ubd_tree; val m_farrow_ubd = new M_FARROW_UBD[m_farrow_ubd_tree.T_Result]("FarrowUbd", m_farrow_ubd_tree.t_Result); - // Debug.activate(); + if (args.contains("--debug")) Debug.activate(); m_farrow_ubd_tree.finish(); m_farrow_ubd.finish(); diff --git a/examples/scala/farrow-ubd-fiber-driver.scala b/examples/scala/farrow-ubd-fiber-driver.scala index 59cc7741..7a2ca210 100644 --- a/examples/scala/farrow-ubd-fiber-driver.scala +++ b/examples/scala/farrow-ubd-fiber-driver.scala @@ -16,7 +16,7 @@ object FarrowUbdFiberDriver extends App { val m_farrow_ubd_tree = farrow_ubd_tree; val m_farrow_ubd = new M_FARROW_UBD_FIBER[m_farrow_ubd_tree.T_Result]("FarrowUbdFiber", m_farrow_ubd_tree.t_Result); - // Debug.activate(); + if (args.contains("--debug")) Debug.activate(); m_farrow_ubd_tree.finish(); m_farrow_ubd.finish(); diff --git a/examples/scala/nested-ubd-driver.scala b/examples/scala/nested-ubd-driver.scala index 42b59919..182673b7 100644 --- a/examples/scala/nested-ubd-driver.scala +++ b/examples/scala/nested-ubd-driver.scala @@ -16,7 +16,7 @@ object NestedUbdDriver extends App { val m_nested_ubd_tree = nested_ubd_tree; val m_nested_ubd = new M_NESTED_UBD[m_nested_ubd_tree.T_Result]("NestedUbd", m_nested_ubd_tree.t_Result); - // Debug.activate(); + if (args.contains("--debug")) Debug.activate(); m_nested_ubd_tree.finish(); m_nested_ubd.finish(); diff --git a/examples/scala/nested-ubd-fiber-driver.scala b/examples/scala/nested-ubd-fiber-driver.scala index d742a0e0..6063fda8 100644 --- a/examples/scala/nested-ubd-fiber-driver.scala +++ b/examples/scala/nested-ubd-fiber-driver.scala @@ -16,7 +16,7 @@ object NestedUbdFiberDriver extends App { val m_nested_ubd_tree = nested_ubd_tree; val m_nested_ubd = new M_NESTED_UBD_FIBER[m_nested_ubd_tree.T_Result]("NestedUbdFiber", m_nested_ubd_tree.t_Result); - // Debug.activate(); + if (args.contains("--debug")) Debug.activate(); m_nested_ubd_tree.finish(); m_nested_ubd.finish();