Merge pull request diffblue#2563 from tautschnig/vs-rm-interface

tautschnig · web-flow · commit 6acabcb2c8d8 · 2018-07-10T09:31:48.000+01:00
Remove unused interface
diff --git a/src/goto-instrument/accelerate/disjunctive_polynomial_acceleration.h b/src/goto-instrument/accelerate/disjunctive_polynomial_acceleration.h
@@ -27,11 +27,10 @@ Author: Matt Lewis
 #include "polynomial.h"
 #include "path.h"
 #include "accelerator.h"
-#include "loop_acceleration.h"
 #include "cone_of_influence.h"
 #include "acceleration_utils.h"
 
-class disjunctive_polynomial_accelerationt:public loop_accelerationt
+class disjunctive_polynomial_accelerationt
 {
 public:
   disjunctive_polynomial_accelerationt(
@@ -56,7 +55,7 @@ class disjunctive_polynomial_accelerationt:public loop_accelerationt
     utils.find_modified(loop, modified);
   }
 
-  virtual bool accelerate(path_acceleratort &accelerator);
+  bool accelerate(path_acceleratort &accelerator);
 
   bool fit_polynomial(
     exprt &target,
diff --git a/src/goto-instrument/accelerate/enumerating_loop_acceleration.h b/src/goto-instrument/accelerate/enumerating_loop_acceleration.h
@@ -20,14 +20,13 @@ Author: Matt Lewis
 
 #include <analyses/natural_loops.h>
 
-#include "loop_acceleration.h"
 #include "polynomial_accelerator.h"
 #include "path_enumerator.h"
 #include "all_paths_enumerator.h"
 #include "sat_path_enumerator.h"
 
 
-class enumerating_loop_accelerationt:public loop_accelerationt
+class enumerating_loop_accelerationt
 {
 public:
   enumerating_loop_accelerationt(
@@ -56,7 +55,7 @@ class enumerating_loop_accelerationt:public loop_accelerationt
   {
   }
 
-  virtual bool accelerate(path_acceleratort &accelerator);
+  bool accelerate(path_acceleratort &accelerator);
 
 protected:
   symbol_tablet &symbol_table;
diff --git a/src/goto-instrument/accelerate/loop_acceleration.h b/src/goto-instrument/accelerate/loop_acceleration.h
diff --git a/src/goto-instrument/accelerate/polynomial_accelerator.h b/src/goto-instrument/accelerate/polynomial_accelerator.h
@@ -58,7 +58,7 @@ class polynomial_acceleratort
   {
   }
 
-  virtual bool accelerate(patht &loop, path_acceleratort &accelerator);
+  bool accelerate(patht &loop, path_acceleratort &accelerator);
 
   bool fit_polynomial(
     goto_programt::instructionst &loop_body,
diff --git a/src/goto-instrument/accelerate/sat_path_enumerator.h b/src/goto-instrument/accelerate/sat_path_enumerator.h
@@ -27,7 +27,6 @@ Author: Matt Lewis
 #include "polynomial.h"
 #include "path.h"
 #include "accelerator.h"
-#include "loop_acceleration.h"
 #include "cone_of_influence.h"
 #include "acceleration_utils.h"
 

Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,13 @@ Author: Matt Lewis`
`20`	`20`
`21`	`21`	`#include <analyses/natural_loops.h>`
`22`	`22`
`23`		`-#include "loop_acceleration.h"`
`24`	`23`	`#include "polynomial_accelerator.h"`
`25`	`24`	`#include "path_enumerator.h"`
`26`	`25`	`#include "all_paths_enumerator.h"`
`27`	`26`	`#include "sat_path_enumerator.h"`
`28`	`27`
`29`	`28`
`30`		`-class enumerating_loop_accelerationt:public loop_accelerationt`
	`29`	`+class enumerating_loop_accelerationt`
`31`	`30`	`{`
`32`	`31`	`public:`
`33`	`32`	`enumerating_loop_accelerationt(`
`@@ -56,7 +55,7 @@ class enumerating_loop_accelerationt:public loop_accelerationt`
`56`	`55`	`{`
`57`	`56`	`}`
`58`	`57`
`59`		`- virtual bool accelerate(path_acceleratort &accelerator);`
	`58`	`+ bool accelerate(path_acceleratort &accelerator);`
`60`	`59`
`61`	`60`	`protected:`
`62`	`61`	`symbol_tablet &symbol_table;`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class polynomial_acceleratort`
`58`	`58`	`{`
`59`	`59`	`}`
`60`	`60`
`61`		`- virtual bool accelerate(patht &loop, path_acceleratort &accelerator);`
	`61`	`+ bool accelerate(patht &loop, path_acceleratort &accelerator);`
`62`	`62`
`63`	`63`	`bool fit_polynomial(`
`64`	`64`	`goto_programt::instructionst &loop_body,`