Skip to content

Commit

Permalink
Improve #include structure for ecflow/simulator
Browse files Browse the repository at this point in the history 
Re ECFLOW-1932
  • Loading branch information
@marcosbento
marcosbento committed Dec 1, 2023
1 parent d06a9bd commit c62f9c9
Show file tree
Hide file tree
Showing 24 changed files with 35 additions and 35 deletions.
24 changes: 12 additions & 12 deletions CSim/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@

set(srcs
# Headers
src/Analyser.hpp
src/AstAnalyserVisitor.hpp
src/DefsAnalyserVisitor.hpp
src/FlatAnalyserVisitor.hpp
src/Simulator.hpp
src/SimulatorVisitor.hpp
src/ecflow/simulator/Analyser.hpp
src/ecflow/simulator/AstAnalyserVisitor.hpp
src/ecflow/simulator/DefsAnalyserVisitor.hpp
src/ecflow/simulator/FlatAnalyserVisitor.hpp
src/ecflow/simulator/Simulator.hpp
src/ecflow/simulator/SimulatorVisitor.hpp
# Sources
src/Analyser.cpp
src/AstAnalyserVisitor.cpp
src/DefsAnalyserVisitor.cpp
src/FlatAnalyserVisitor.cpp
src/Simulator.cpp
src/SimulatorVisitor.cpp
src/ecflow/simulator/Analyser.cpp
src/ecflow/simulator/AstAnalyserVisitor.cpp
src/ecflow/simulator/DefsAnalyserVisitor.cpp
src/ecflow/simulator/FlatAnalyserVisitor.cpp
src/ecflow/simulator/Simulator.cpp
src/ecflow/simulator/SimulatorVisitor.cpp
)
ecbuild_add_library(
TARGET
Expand Down
6 changes: 3 additions & 3 deletions CSim/src/Analyser.cpp → CSim/src/ecflow/simulator/Analyser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
* nor does it submit to any jurisdiction.
*/

#include "Analyser.hpp"
#include "ecflow/simulator/Analyser.hpp"

#include <fstream>

#include "DefsAnalyserVisitor.hpp"
#include "FlatAnalyserVisitor.hpp"
#include "ecflow/node/Defs.hpp"
#include "ecflow/simulator/DefsAnalyserVisitor.hpp"
#include "ecflow/simulator/FlatAnalyserVisitor.hpp"

using namespace std;

Expand Down
0 CSim/src/Analyser.hpp → CSim/src/ecflow/simulator/Analyser.hpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion CSim/src/AstAnalyserVisitor.cpp → ...c/ecflow/simulator/AstAnalyserVisitor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* nor does it submit to any jurisdiction.
*/

#include "AstAnalyserVisitor.hpp"
#include "ecflow/simulator/AstAnalyserVisitor.hpp"

#include "ecflow/node/ExprAst.hpp"

Expand Down
0 CSim/src/AstAnalyserVisitor.hpp → ...c/ecflow/simulator/AstAnalyserVisitor.hpp
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions CSim/src/DefsAnalyserVisitor.cpp → .../ecflow/simulator/DefsAnalyserVisitor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
* nor does it submit to any jurisdiction.
*/

#include "DefsAnalyserVisitor.hpp"
#include "ecflow/simulator/DefsAnalyserVisitor.hpp"

#include "AstAnalyserVisitor.hpp"
#include "ecflow/core/Indentor.hpp"
#include "ecflow/node/Defs.hpp"
#include "ecflow/node/ExprAst.hpp"
#include "ecflow/node/Family.hpp"
#include "ecflow/node/Suite.hpp"
#include "ecflow/node/Task.hpp"
#include "ecflow/simulator/AstAnalyserVisitor.hpp"

using namespace std;

Expand Down
0 CSim/src/DefsAnalyserVisitor.hpp → .../ecflow/simulator/DefsAnalyserVisitor.hpp
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions CSim/src/FlatAnalyserVisitor.cpp → .../ecflow/simulator/FlatAnalyserVisitor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
* nor does it submit to any jurisdiction.
*/

#include "FlatAnalyserVisitor.hpp"
#include "ecflow/simulator/FlatAnalyserVisitor.hpp"

#include "AstAnalyserVisitor.hpp"
#include "ecflow/core/Indentor.hpp"
#include "ecflow/core/Str.hpp"
#include "ecflow/node/Defs.hpp"
#include "ecflow/node/ExprAst.hpp"
#include "ecflow/node/Family.hpp"
#include "ecflow/node/Suite.hpp"
#include "ecflow/node/Task.hpp"
#include "ecflow/simulator/AstAnalyserVisitor.hpp"

using namespace std;

Expand Down
0 CSim/src/FlatAnalyserVisitor.hpp → .../ecflow/simulator/FlatAnalyserVisitor.hpp
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions CSim/src/Simulator.cpp → CSim/src/ecflow/simulator/Simulator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@
* nor does it submit to any jurisdiction.
*/

#include "Simulator.hpp"
#include "ecflow/simulator/Simulator.hpp"

#include <boost/date_time/posix_time/time_formatters.hpp> // requires boost date and time lib
#include <boost/filesystem/operations.hpp>

#include "Analyser.hpp"
#include "SimulatorVisitor.hpp"
#include "ecflow/attribute/QueueAttr.hpp"
#include "ecflow/core/CalendarUpdateParams.hpp"
#include "ecflow/core/Log.hpp"
Expand All @@ -24,6 +22,8 @@
#include "ecflow/node/JobsParam.hpp"
#include "ecflow/node/Submittable.hpp"
#include "ecflow/node/Suite.hpp"
#include "ecflow/simulator/Analyser.hpp"
#include "ecflow/simulator/SimulatorVisitor.hpp"

using namespace boost::gregorian;
using namespace boost::posix_time;
Expand Down
0 CSim/src/Simulator.hpp → CSim/src/ecflow/simulator/Simulator.hpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion CSim/src/SimulatorVisitor.cpp → ...src/ecflow/simulator/SimulatorVisitor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* nor does it submit to any jurisdiction.
*/

#include "SimulatorVisitor.hpp"
#include "ecflow/simulator/SimulatorVisitor.hpp"

#include <boost/date_time/posix_time/posix_time_types.hpp>

Expand Down
0 CSim/src/SimulatorVisitor.hpp → ...src/ecflow/simulator/SimulatorVisitor.hpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion CSim/test/TestAnalysis.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
#include <boost/filesystem/operations.hpp>
#include <boost/test/unit_test.hpp>

#include "Simulator.hpp"
#include "TestUtil.hpp"
#include "ecflow/node/Defs.hpp"
#include "ecflow/node/Family.hpp"
#include "ecflow/node/Suite.hpp"
#include "ecflow/node/System.hpp"
#include "ecflow/node/Task.hpp"
#include "ecflow/simulator/Simulator.hpp"

using namespace std;
using namespace ecf;
Expand Down
2 changes: 1 addition & 1 deletion CSim/test/TestAutoArchive.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <boost/filesystem/operations.hpp>
#include <boost/test/unit_test.hpp>

#include "Simulator.hpp"
#include "TestUtil.hpp"
#include "ecflow/attribute/AutoArchiveAttr.hpp"
#include "ecflow/core/File.hpp"
Expand All @@ -23,6 +22,7 @@
#include "ecflow/node/Family.hpp"
#include "ecflow/node/Suite.hpp"
#include "ecflow/node/Task.hpp"
#include "ecflow/simulator/Simulator.hpp"

using namespace std;
using namespace ecf;
Expand Down
2 changes: 1 addition & 1 deletion CSim/test/TestAutoCancel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
#include <boost/filesystem/operations.hpp>
#include <boost/test/unit_test.hpp>

#include "Simulator.hpp"
#include "TestUtil.hpp"
#include "ecflow/attribute/AutoCancelAttr.hpp"
#include "ecflow/node/Defs.hpp"
#include "ecflow/node/Family.hpp"
#include "ecflow/node/Suite.hpp"
#include "ecflow/node/Task.hpp"
#include "ecflow/simulator/Simulator.hpp"

using namespace std;
using namespace ecf;
Expand Down
2 changes: 1 addition & 1 deletion CSim/test/TestAutoRestore.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <boost/filesystem/operations.hpp>
#include <boost/test/unit_test.hpp>

#include "Simulator.hpp"
#include "TestUtil.hpp"
#include "ecflow/attribute/AutoArchiveAttr.hpp"
#include "ecflow/core/File.hpp"
Expand All @@ -24,6 +23,7 @@
#include "ecflow/node/Family.hpp"
#include "ecflow/node/Suite.hpp"
#include "ecflow/node/Task.hpp"
#include "ecflow/simulator/Simulator.hpp"

using namespace std;
using namespace ecf;
Expand Down
2 changes: 1 addition & 1 deletion CSim/test/TestMeter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
#include <boost/filesystem/operations.hpp>
#include <boost/test/unit_test.hpp>

#include "Simulator.hpp"
#include "TestUtil.hpp"
#include "ecflow/attribute/VerifyAttr.hpp"
#include "ecflow/node/Defs.hpp"
#include "ecflow/node/Family.hpp"
#include "ecflow/node/Suite.hpp"
#include "ecflow/node/System.hpp"
#include "ecflow/node/Task.hpp"
#include "ecflow/simulator/Simulator.hpp"

using namespace std;
using namespace ecf;
Expand Down
2 changes: 1 addition & 1 deletion CSim/test/TestRepeat.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
#include <boost/filesystem/operations.hpp>
#include <boost/test/unit_test.hpp>

#include "Simulator.hpp"
#include "TestUtil.hpp"
#include "ecflow/attribute/VerifyAttr.hpp"
#include "ecflow/core/Converter.hpp"
#include "ecflow/node/Defs.hpp"
#include "ecflow/node/Family.hpp"
#include "ecflow/node/Suite.hpp"
#include "ecflow/node/Task.hpp"
#include "ecflow/simulator/Simulator.hpp"

using namespace std;
using namespace ecf;
Expand Down
2 changes: 1 addition & 1 deletion CSim/test/TestSimulator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
#define BOOST_TEST_MODULE TestSimulator
#include <boost/test/included/unit_test.hpp>

#include "Simulator.hpp"
#include "ecflow/core/File.hpp"
#include "ecflow/node/System.hpp"
#include "ecflow/simulator/Simulator.hpp"

namespace fs = boost::filesystem;

Expand Down
2 changes: 1 addition & 1 deletion CSim/test/TestSingleSimulator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#define BOOST_TEST_MODULE TestSingleSimulator
#include <boost/test/included/unit_test.hpp>

#include "Simulator.hpp"
#include "ecflow/core/File.hpp"
#include "ecflow/core/Log.hpp"
#include "ecflow/core/TestUtil.hpp"
Expand All @@ -27,6 +26,7 @@
#include "ecflow/node/Suite.hpp"
#include "ecflow/node/System.hpp"
#include "ecflow/node/Task.hpp"
#include "ecflow/simulator/Simulator.hpp"

using namespace std;
using namespace ecf;
Expand Down
2 changes: 1 addition & 1 deletion CSim/test/TestTime.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
#include <boost/filesystem/operations.hpp>
#include <boost/test/unit_test.hpp>

#include "Simulator.hpp"
#include "TestUtil.hpp"
#include "ecflow/attribute/VerifyAttr.hpp"
#include "ecflow/node/Defs.hpp"
#include "ecflow/node/Family.hpp"
#include "ecflow/node/Suite.hpp"
#include "ecflow/node/Task.hpp"
#include "ecflow/simulator/Simulator.hpp"

using namespace std;
using namespace ecf;
Expand Down
2 changes: 1 addition & 1 deletion CSim/test/TestToday.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
#include <boost/filesystem/operations.hpp>
#include <boost/test/unit_test.hpp>

#include "Simulator.hpp"
#include "TestUtil.hpp"
#include "ecflow/attribute/VerifyAttr.hpp"
#include "ecflow/node/Defs.hpp"
#include "ecflow/node/Family.hpp"
#include "ecflow/node/Suite.hpp"
#include "ecflow/node/Task.hpp"
#include "ecflow/simulator/Simulator.hpp"

using namespace std;
using namespace ecf;
Expand Down
2 changes: 1 addition & 1 deletion Pyext/src/ecflow/python/ExportDefs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include <boost/python.hpp>
#include <boost/python/raw_function.hpp>

#include "Simulator.hpp"
#include "ecflow/core/Converter.hpp"
#include "ecflow/core/File.hpp"
#include "ecflow/core/PrintStyle.hpp"
Expand All @@ -24,6 +23,7 @@
#include "ecflow/python/DefsDoc.hpp"
#include "ecflow/python/Edit.hpp"
#include "ecflow/python/GlossaryDoc.hpp"
#include "ecflow/simulator/Simulator.hpp"

using namespace ecf;
using namespace boost::python;
Expand Down

0 comments on commit c62f9c9

Please sign in to comment.