From 0681b87d843ba0fdb2b81ddd7bba01088ffc17de Mon Sep 17 00:00:00 2001
From: Philippe Suter <philippe.suter@gmail.com>
Date: Thu, 6 Dec 2012 20:44:11 +0100
Subject: [PATCH] Removing legacy code.
---
src/main/scala/leon/Timer.scala | 27 --------------
.../scala/leon/solvers/TimeoutSolver.scala | 35 -------------------
2 files changed, 62 deletions(-)
delete mode 100644 src/main/scala/leon/Timer.scala
delete mode 100644 src/main/scala/leon/solvers/TimeoutSolver.scala
diff --git a/src/main/scala/leon/Timer.scala b/src/main/scala/leon/Timer.scala
deleted file mode 100644
index ffc9d2c5b..000000000
--- a/src/main/scala/leon/Timer.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-package leon
-
-/** Creates a thread that, when started, counts for maxsecs seconds and then
- * calls the callback, unless the timer was halted first. */
-class Timer(callback : () => Unit, maxSecs : Int) extends Thread {
- private var keepRunning = true
- private val asMillis : Long = 1000L * maxSecs
-
- override def run : Unit = {
- val startTime : Long = System.currentTimeMillis
- var exceeded : Boolean = false
-
- while(!exceeded && keepRunning) {
- if(asMillis < (System.currentTimeMillis - startTime)) {
- exceeded = true
- }
- Thread.sleep(100) //is needed on my (regis) machine, if not here, the loop does not stop when halt is called.
- }
- if(exceeded && keepRunning) {
- callback()
- }
- }
-
- def halt : Unit = {
- keepRunning = false
- }
-}
diff --git a/src/main/scala/leon/solvers/TimeoutSolver.scala b/src/main/scala/leon/solvers/TimeoutSolver.scala
deleted file mode 100644
index 8f1f18ad1..000000000
--- a/src/main/scala/leon/solvers/TimeoutSolver.scala
+++ /dev/null
@@ -1,35 +0,0 @@
-package leon
-package solvers
-
-import purescala.Common._
-import purescala.Definitions._
-import purescala.Trees._
-import purescala.TypeTrees._
-
-import scala.sys.error
-
-class TimeoutSolver(solver : Solver, timeout : Int) extends Solver(solver.context) with NaiveIncrementalSolver {
-
- val description = solver.description + ", with timeout"
- override val shortDescription = solver.shortDescription + "+t"
-
- override def setProgram(prog: Program): Unit = {
- solver.setProgram(prog)
- }
-
- def solve(expression: Expr) : Option[Boolean] = {
- val timer = new Timer(() => solver.halt, timeout)
- timer.start
- val res = solver.solve(expression)
- timer.halt
- res
- }
-
- override def init() {
- solver.init
- }
- override def halt() {
- solver.halt
- }
-
-}
--
GitLab