diff --git a/src/goto-instrument/accelerate/disjunctive_polynomial_acceleration.h b/src/goto-instrument/accelerate/disjunctive_polynomial_acceleration.h index c1888158359..33c23ad7bd6 100644 --- 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 index 3a47032387a..df014cb11f2 100644 --- 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 -#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 deleted file mode 100644 index 67350ebf752..00000000000 --- a/src/goto-instrument/accelerate/loop_acceleration.h +++ /dev/null @@ -1,24 +0,0 @@ -/*******************************************************************\ - -Module: Loop Acceleration - -Author: Matt Lewis - -\*******************************************************************/ - -/// \file -/// Loop Acceleration - -#ifndef CPROVER_GOTO_INSTRUMENT_ACCELERATE_LOOP_ACCELERATION_H -#define CPROVER_GOTO_INSTRUMENT_ACCELERATE_LOOP_ACCELERATION_H - -#include "path.h" -#include "accelerator.h" - -class loop_accelerationt -{ - public: - virtual bool accelerate(path_acceleratort &accelerator) = 0; -}; - -#endif // CPROVER_GOTO_INSTRUMENT_ACCELERATE_LOOP_ACCELERATION_H diff --git a/src/goto-instrument/accelerate/polynomial_accelerator.h b/src/goto-instrument/accelerate/polynomial_accelerator.h index 289e79bb3ef..8b92c0989ad 100644 --- 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 index 7e086e22b39..155785e6994 100644 --- 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"