From 5a7cd1839bb30ea43d178f2241da8a9db92ae693 Mon Sep 17 00:00:00 2001 From: Alex Lin Date: Thu, 25 Feb 2016 16:04:27 -0600 Subject: [PATCH] Split test sims and fun sims into separate directories. I created an ODE directory and moved the ODE sims into it. I moved the Ball++ models into SIM_Ball++_L1 and flattened the directory structure. refs #191 --- .../{ => ODE}/SIM_ode_ball/RUN_test/input.py | 0 trick_sims/{ => ODE}/SIM_ode_ball/S_define | 4 ++-- trick_sims/{ => ODE}/SIM_ode_ball/S_overrides.mk | 4 ++-- .../ODE/SIM_ode_ball/models}/Ball/Ball.cpp | 0 .../ODE/SIM_ode_ball/models}/Ball/Ball.hh | 2 +- .../{ => ODE}/SIM_ode_buggy/RUN_test/input.py | 0 trick_sims/{ => ODE}/SIM_ode_buggy/S_define | 4 ++-- .../{ => ODE}/SIM_ode_buggy/S_overrides.mk | 4 ++-- .../ODE/SIM_ode_buggy/models}/Buggy/Buggy.cpp | 0 .../ODE/SIM_ode_buggy/models}/Buggy/Buggy.hh | 2 +- .../ODE/models}/DrawStuff/DrawStuff.cpp | 0 .../ODE/models}/DrawStuff/DrawStuff.hh | 0 .../ODE/models}/DrawStuff/DrawStuffObject.cpp | 0 .../ODE/models}/DrawStuff/DrawStuffObject.hh | 0 trick_sims/SIM_Ball++_L1/S_define | 2 +- trick_sims/SIM_Ball++_L1/S_overrides.mk | 4 ++-- .../SIM_Ball++_L1/models}/Ball.cpp | 2 +- .../SIM_Ball++_L1/models}/Ball.hh | 16 ++++++++-------- .../SIM_Ball++_L1/models}/BallForce.cpp | 2 +- .../SIM_Ball++_L1/models}/BallForce.hh | 0 .../SIM_Ball++_L1/models}/BallForceField.cpp | 2 +- .../models}/BallForce_default_data.cpp | 2 +- .../SIM_Ball++_L1/models}/BallShutdown.cpp | 4 ++-- .../SIM_Ball++_L1/models}/BallState.cpp | 6 +++--- .../SIM_Ball++_L1/models}/BallState.hh | 0 .../SIM_Ball++_L1/models}/BallStateDeriv.cpp | 4 ++-- .../SIM_Ball++_L1/models}/BallStateInit.cpp | 2 +- .../SIM_Ball++_L1/models}/BallStateInteg.cpp | 4 ++-- .../SIM_Ball++_L1/models}/BallStatePrint.cpp | 8 ++++---- .../models}/BallState_default_data.cpp | 6 +++--- 30 files changed, 42 insertions(+), 42 deletions(-) rename trick_sims/{ => ODE}/SIM_ode_ball/RUN_test/input.py (100%) rename trick_sims/{ => ODE}/SIM_ode_ball/S_define (93%) rename trick_sims/{ => ODE}/SIM_ode_ball/S_overrides.mk (62%) rename {trick_models/ODE => trick_sims/ODE/SIM_ode_ball/models}/Ball/Ball.cpp (100%) rename {trick_models/ODE => trick_sims/ODE/SIM_ode_ball/models}/Ball/Ball.hh (94%) rename trick_sims/{ => ODE}/SIM_ode_buggy/RUN_test/input.py (100%) rename trick_sims/{ => ODE}/SIM_ode_buggy/S_define (93%) rename trick_sims/{ => ODE}/SIM_ode_buggy/S_overrides.mk (62%) rename {trick_models/ODE => trick_sims/ODE/SIM_ode_buggy/models}/Buggy/Buggy.cpp (100%) rename {trick_models/ODE => trick_sims/ODE/SIM_ode_buggy/models}/Buggy/Buggy.hh (97%) rename {trick_models/ODE => trick_sims/ODE/models}/DrawStuff/DrawStuff.cpp (100%) rename {trick_models/ODE => trick_sims/ODE/models}/DrawStuff/DrawStuff.hh (100%) rename {trick_models/ODE => trick_sims/ODE/models}/DrawStuff/DrawStuffObject.cpp (100%) rename {trick_models/ODE => trick_sims/ODE/models}/DrawStuff/DrawStuffObject.hh (100%) rename {trick_models/Ball++/L1/src => trick_sims/SIM_Ball++_L1/models}/Ball.cpp (97%) rename {trick_models/Ball++/L1/include => trick_sims/SIM_Ball++_L1/models}/Ball.hh (85%) rename {trick_models/Ball++/L1/src => trick_sims/SIM_Ball++_L1/models}/BallForce.cpp (81%) rename {trick_models/Ball++/L1/include => trick_sims/SIM_Ball++_L1/models}/BallForce.hh (100%) rename {trick_models/Ball++/L1/src => trick_sims/SIM_Ball++_L1/models}/BallForceField.cpp (98%) rename {trick_models/Ball++/L1/src => trick_sims/SIM_Ball++_L1/models}/BallForce_default_data.cpp (97%) rename {trick_models/Ball++/L1/src => trick_sims/SIM_Ball++_L1/models}/BallShutdown.cpp (93%) rename {trick_models/Ball++/L1/src => trick_sims/SIM_Ball++_L1/models}/BallState.cpp (87%) rename {trick_models/Ball++/L1/include => trick_sims/SIM_Ball++_L1/models}/BallState.hh (100%) rename {trick_models/Ball++/L1/src => trick_sims/SIM_Ball++_L1/models}/BallStateDeriv.cpp (96%) rename {trick_models/Ball++/L1/src => trick_sims/SIM_Ball++_L1/models}/BallStateInit.cpp (98%) rename {trick_models/Ball++/L1/src => trick_sims/SIM_Ball++_L1/models}/BallStateInteg.cpp (95%) rename {trick_models/Ball++/L1/src => trick_sims/SIM_Ball++_L1/models}/BallStatePrint.cpp (87%) rename {trick_models/Ball++/L1/src => trick_sims/SIM_Ball++_L1/models}/BallState_default_data.cpp (90%) diff --git a/trick_sims/SIM_ode_ball/RUN_test/input.py b/trick_sims/ODE/SIM_ode_ball/RUN_test/input.py similarity index 100% rename from trick_sims/SIM_ode_ball/RUN_test/input.py rename to trick_sims/ODE/SIM_ode_ball/RUN_test/input.py diff --git a/trick_sims/SIM_ode_ball/S_define b/trick_sims/ODE/SIM_ode_ball/S_define similarity index 93% rename from trick_sims/SIM_ode_ball/S_define rename to trick_sims/ODE/SIM_ode_ball/S_define index 5e15ce83..36ad7bdc 100644 --- a/trick_sims/SIM_ode_ball/S_define +++ b/trick_sims/ODE/SIM_ode_ball/S_define @@ -10,8 +10,8 @@ LIBRARY DEPENDENCIES: #include "sim_objects/default_trick_sys.sm" -##include "ODE/Ball/Ball.hh" -##include "ODE/DrawStuff/DrawStuff.hh" +##include "Ball/Ball.hh" +##include "DrawStuff/DrawStuff.hh" %{ const double OdeBallSimObject::time_step = 0.01 ; diff --git a/trick_sims/SIM_ode_ball/S_overrides.mk b/trick_sims/ODE/SIM_ode_ball/S_overrides.mk similarity index 62% rename from trick_sims/SIM_ode_ball/S_overrides.mk rename to trick_sims/ODE/SIM_ode_ball/S_overrides.mk index ae807dd6..0c8efba9 100644 --- a/trick_sims/SIM_ode_ball/S_overrides.mk +++ b/trick_sims/ODE/SIM_ode_ball/S_overrides.mk @@ -5,7 +5,7 @@ TRICK_ICG_EXCLUDE = ${ODE_HOME} TRICK_ICG_NOCOMMENT = ${ODE_HOME} TRICK_SWIG_EXCLUDE = ${ODE_HOME} -TRICK_CFLAGS += -I${TRICK_HOME}/trick_models -I${ODE_HOME}/include -I${ODE_HOME} -TRICK_CXXFLAGS += -I${TRICK_HOME}/trick_models -I${ODE_HOME}/include -I${ODE_HOME} +TRICK_CFLAGS += -I./models -I../models -I${ODE_HOME}/include -I${ODE_HOME} +TRICK_CXXFLAGS += -I./models -I../models -I${ODE_HOME}/include -I${ODE_HOME} TRICK_EXEC_LINK_LIBS += -L${ODE_HOME}/drawstuff/src/.libs -ldrawstuff -L${ODE_HOME}/ode/src/.libs -lode -lGLU -lGL -L/usr/X11R6/lib -lXext -lX11 diff --git a/trick_models/ODE/Ball/Ball.cpp b/trick_sims/ODE/SIM_ode_ball/models/Ball/Ball.cpp similarity index 100% rename from trick_models/ODE/Ball/Ball.cpp rename to trick_sims/ODE/SIM_ode_ball/models/Ball/Ball.cpp diff --git a/trick_models/ODE/Ball/Ball.hh b/trick_sims/ODE/SIM_ode_ball/models/Ball/Ball.hh similarity index 94% rename from trick_models/ODE/Ball/Ball.hh rename to trick_sims/ODE/SIM_ode_ball/models/Ball/Ball.hh index 527a055d..346cc4a1 100644 --- a/trick_models/ODE/Ball/Ball.hh +++ b/trick_sims/ODE/SIM_ode_ball/models/Ball/Ball.hh @@ -11,7 +11,7 @@ LIBRARY DEPENDENCY: #include #include -#include "ODE/DrawStuff/DrawStuffObject.hh" +#include "DrawStuff/DrawStuffObject.hh" class Ball : public DrawStuffObject { public: diff --git a/trick_sims/SIM_ode_buggy/RUN_test/input.py b/trick_sims/ODE/SIM_ode_buggy/RUN_test/input.py similarity index 100% rename from trick_sims/SIM_ode_buggy/RUN_test/input.py rename to trick_sims/ODE/SIM_ode_buggy/RUN_test/input.py diff --git a/trick_sims/SIM_ode_buggy/S_define b/trick_sims/ODE/SIM_ode_buggy/S_define similarity index 93% rename from trick_sims/SIM_ode_buggy/S_define rename to trick_sims/ODE/SIM_ode_buggy/S_define index 382b6397..5ebc6b0d 100644 --- a/trick_sims/SIM_ode_buggy/S_define +++ b/trick_sims/ODE/SIM_ode_buggy/S_define @@ -10,8 +10,8 @@ LIBRARY DEPENDENCIES: #include "sim_objects/default_trick_sys.sm" -##include "ODE/Buggy/Buggy.hh" -##include "ODE/DrawStuff/DrawStuff.hh" +##include "Buggy/Buggy.hh" +##include "DrawStuff/DrawStuff.hh" %{ const double BuggySimObject::time_step = 0.05 ; diff --git a/trick_sims/SIM_ode_buggy/S_overrides.mk b/trick_sims/ODE/SIM_ode_buggy/S_overrides.mk similarity index 62% rename from trick_sims/SIM_ode_buggy/S_overrides.mk rename to trick_sims/ODE/SIM_ode_buggy/S_overrides.mk index e973872c..32328829 100644 --- a/trick_sims/SIM_ode_buggy/S_overrides.mk +++ b/trick_sims/ODE/SIM_ode_buggy/S_overrides.mk @@ -5,7 +5,7 @@ TRICK_ICG_EXCLUDE = ${ODE_HOME} TRICK_ICG_NOCOMMENT = ${ODE_HOME} TRICK_SWIG_EXCLUDE = ${ODE_HOME} -TRICK_CFLAGS += -I${TRICK_HOME}/trick_models -I${ODE_HOME}/include -I${ODE_HOME} -TRICK_CXXFLAGS += -I${TRICK_HOME}/trick_models -I${ODE_HOME}/include -I${ODE_HOME} +TRICK_CFLAGS += -I./models -I../models -I${ODE_HOME}/include -I${ODE_HOME} +TRICK_CXXFLAGS += -I./models -I../models -I${ODE_HOME}/include -I${ODE_HOME} TRICK_EXEC_LINK_LIBS += -L${ODE_HOME}/drawstuff/src/.libs -ldrawstuff -L${ODE_HOME}/ode/src/.libs -lode -lGLU -lGL -L/usr/X11R6/lib -lXext -lX11 diff --git a/trick_models/ODE/Buggy/Buggy.cpp b/trick_sims/ODE/SIM_ode_buggy/models/Buggy/Buggy.cpp similarity index 100% rename from trick_models/ODE/Buggy/Buggy.cpp rename to trick_sims/ODE/SIM_ode_buggy/models/Buggy/Buggy.cpp diff --git a/trick_models/ODE/Buggy/Buggy.hh b/trick_sims/ODE/SIM_ode_buggy/models/Buggy/Buggy.hh similarity index 97% rename from trick_models/ODE/Buggy/Buggy.hh rename to trick_sims/ODE/SIM_ode_buggy/models/Buggy/Buggy.hh index 0f29ee54..12e21b6b 100644 --- a/trick_models/ODE/Buggy/Buggy.hh +++ b/trick_sims/ODE/SIM_ode_buggy/models/Buggy/Buggy.hh @@ -11,7 +11,7 @@ LIBRARY DEPENDENCY: #include #include -#include "ODE/DrawStuff/DrawStuffObject.hh" +#include "DrawStuff/DrawStuffObject.hh" #if SWIG %apply float { dReal } diff --git a/trick_models/ODE/DrawStuff/DrawStuff.cpp b/trick_sims/ODE/models/DrawStuff/DrawStuff.cpp similarity index 100% rename from trick_models/ODE/DrawStuff/DrawStuff.cpp rename to trick_sims/ODE/models/DrawStuff/DrawStuff.cpp diff --git a/trick_models/ODE/DrawStuff/DrawStuff.hh b/trick_sims/ODE/models/DrawStuff/DrawStuff.hh similarity index 100% rename from trick_models/ODE/DrawStuff/DrawStuff.hh rename to trick_sims/ODE/models/DrawStuff/DrawStuff.hh diff --git a/trick_models/ODE/DrawStuff/DrawStuffObject.cpp b/trick_sims/ODE/models/DrawStuff/DrawStuffObject.cpp similarity index 100% rename from trick_models/ODE/DrawStuff/DrawStuffObject.cpp rename to trick_sims/ODE/models/DrawStuff/DrawStuffObject.cpp diff --git a/trick_models/ODE/DrawStuff/DrawStuffObject.hh b/trick_sims/ODE/models/DrawStuff/DrawStuffObject.hh similarity index 100% rename from trick_models/ODE/DrawStuff/DrawStuffObject.hh rename to trick_sims/ODE/models/DrawStuff/DrawStuffObject.hh diff --git a/trick_sims/SIM_Ball++_L1/S_define b/trick_sims/SIM_Ball++_L1/S_define index 5aa7ca41..da5f9d3b 100644 --- a/trick_sims/SIM_Ball++_L1/S_define +++ b/trick_sims/SIM_Ball++_L1/S_define @@ -9,7 +9,7 @@ LIBRARY DEPENDENCIES: #define TRICK_JSON_VARIABLE_SERVER #include "sim_objects/default_trick_sys.sm" -##include "Ball++/L1/include/Ball.hh" +##include "Ball.hh" /** This class is the base ball class diff --git a/trick_sims/SIM_Ball++_L1/S_overrides.mk b/trick_sims/SIM_Ball++_L1/S_overrides.mk index 8dfa1027..4593b96c 100644 --- a/trick_sims/SIM_Ball++_L1/S_overrides.mk +++ b/trick_sims/SIM_Ball++_L1/S_overrides.mk @@ -2,6 +2,6 @@ # Uncomment this to compile the simulation without a python input processor. #TRICK_CPFLAGS = --no_python -TRICK_CFLAGS += -I${TRICK_HOME}/trick_models -TRICK_CXXFLAGS += -I${TRICK_HOME}/trick_models +TRICK_CFLAGS += -I./models +TRICK_CXXFLAGS += -I./models diff --git a/trick_models/Ball++/L1/src/Ball.cpp b/trick_sims/SIM_Ball++_L1/models/Ball.cpp similarity index 97% rename from trick_models/Ball++/L1/src/Ball.cpp rename to trick_sims/SIM_Ball++_L1/models/Ball.cpp index fb9375b7..063d672a 100644 --- a/trick_models/Ball++/L1/src/Ball.cpp +++ b/trick_sims/SIM_Ball++_L1/models/Ball.cpp @@ -24,7 +24,7 @@ PROGRAMMERS: #include /* Model include files. */ -#include "../include/Ball.hh" +#include "Ball.hh" // Default consructor. Ball::Ball() /* RETURN: -- None. */ diff --git a/trick_models/Ball++/L1/include/Ball.hh b/trick_sims/SIM_Ball++_L1/models/Ball.hh similarity index 85% rename from trick_models/Ball++/L1/include/Ball.hh rename to trick_sims/SIM_Ball++_L1/models/Ball.hh index 56448c24..66dfc08f 100644 --- a/trick_models/Ball++/L1/include/Ball.hh +++ b/trick_sims/SIM_Ball++_L1/models/Ball.hh @@ -15,13 +15,13 @@ ASSUMPTIONS AND LIMITATIONS: ((2 dimensional space) (Translational EOM only)) LIBRARY DEPENDENCY: - ((../src/Ball.cpp) - (../src/BallStateDeriv.cpp) - (../src/BallStateInit.cpp) - (../src/BallStateInteg.cpp) - (../src/BallStatePrint.cpp) - (../src/BallForceField.cpp) - (../src/BallShutdown.cpp)) + ((Ball.cpp) + (BallStateDeriv.cpp) + (BallStateInit.cpp) + (BallStateInteg.cpp) + (BallStatePrint.cpp) + (BallForceField.cpp) + (BallShutdown.cpp)) PROGRAMMERS: (((Robert W. Bailey) (Sweet Systems Inc) (March 1997) (Tutorial Lesson 1)) ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation))) @@ -43,7 +43,7 @@ PROGRAMMERS: @brief ball in C++ */ -#include "sim_services/include/mm_macros.hh" +#include "trick/mm_macros.hh" class Ball { diff --git a/trick_models/Ball++/L1/src/BallForce.cpp b/trick_sims/SIM_Ball++_L1/models/BallForce.cpp similarity index 81% rename from trick_models/Ball++/L1/src/BallForce.cpp rename to trick_sims/SIM_Ball++_L1/models/BallForce.cpp index 9acdc711..6def5b42 100644 --- a/trick_models/Ball++/L1/src/BallForce.cpp +++ b/trick_sims/SIM_Ball++_L1/models/BallForce.cpp @@ -1,5 +1,5 @@ -#include "Ball++/L1/include/BallForce.hh" +#include "BallForce.hh" BallForceInput::BallForceInput() { diff --git a/trick_models/Ball++/L1/include/BallForce.hh b/trick_sims/SIM_Ball++_L1/models/BallForce.hh similarity index 100% rename from trick_models/Ball++/L1/include/BallForce.hh rename to trick_sims/SIM_Ball++_L1/models/BallForce.hh diff --git a/trick_models/Ball++/L1/src/BallForceField.cpp b/trick_sims/SIM_Ball++_L1/models/BallForceField.cpp similarity index 98% rename from trick_models/Ball++/L1/src/BallForceField.cpp rename to trick_sims/SIM_Ball++_L1/models/BallForceField.cpp index aa6c08a1..52a31e6f 100644 --- a/trick_models/Ball++/L1/src/BallForceField.cpp +++ b/trick_sims/SIM_Ball++_L1/models/BallForceField.cpp @@ -27,7 +27,7 @@ PROGRAMMERS: #include /* Model include files. */ -#include "../include/Ball.hh" +#include "Ball.hh" /* ENTRY POINT */ int Ball::force_field() /* RETURN: -- Always return zero. */ diff --git a/trick_models/Ball++/L1/src/BallForce_default_data.cpp b/trick_sims/SIM_Ball++_L1/models/BallForce_default_data.cpp similarity index 97% rename from trick_models/Ball++/L1/src/BallForce_default_data.cpp rename to trick_sims/SIM_Ball++_L1/models/BallForce_default_data.cpp index acebecd3..524b93fe 100644 --- a/trick_models/Ball++/L1/src/BallForce_default_data.cpp +++ b/trick_sims/SIM_Ball++_L1/models/BallForce_default_data.cpp @@ -28,7 +28,7 @@ PROGRAMMERS: #include /* Model include files. */ -#include "../include/BallForce.hh" +#include "BallForce.hh" /* ENTRY POINT */ int BallForce::default_data() { diff --git a/trick_models/Ball++/L1/src/BallShutdown.cpp b/trick_sims/SIM_Ball++_L1/models/BallShutdown.cpp similarity index 93% rename from trick_models/Ball++/L1/src/BallShutdown.cpp rename to trick_sims/SIM_Ball++_L1/models/BallShutdown.cpp index fb6ec647..4c0b67f4 100644 --- a/trick_models/Ball++/L1/src/BallShutdown.cpp +++ b/trick_sims/SIM_Ball++_L1/models/BallShutdown.cpp @@ -22,10 +22,10 @@ PROGRAMMERS: ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation))) *******************************************************************************/ -#include "sim_services/UnitTest/include/trick_tests.h" +#include "trick/trick_tests.h" /* Model include files. */ -#include "../include/Ball.hh" +#include "Ball.hh" /* ENTRY POINT */ int Ball::shutdown() { diff --git a/trick_models/Ball++/L1/src/BallState.cpp b/trick_sims/SIM_Ball++_L1/models/BallState.cpp similarity index 87% rename from trick_models/Ball++/L1/src/BallState.cpp rename to trick_sims/SIM_Ball++_L1/models/BallState.cpp index bc7b56fe..f4227e6f 100644 --- a/trick_models/Ball++/L1/src/BallState.cpp +++ b/trick_sims/SIM_Ball++_L1/models/BallState.cpp @@ -1,9 +1,9 @@ #include -#include "Ball++/L1/include/BallState.hh" -#include "trick_utils/units/include/constant.h" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" +#include "BallState.hh" +#include "trick/constant.h" +#include "trick/memorymanager_c_intf.h" BallStateInput::BallStateInput() { diff --git a/trick_models/Ball++/L1/include/BallState.hh b/trick_sims/SIM_Ball++_L1/models/BallState.hh similarity index 100% rename from trick_models/Ball++/L1/include/BallState.hh rename to trick_sims/SIM_Ball++_L1/models/BallState.hh diff --git a/trick_models/Ball++/L1/src/BallStateDeriv.cpp b/trick_sims/SIM_Ball++_L1/models/BallStateDeriv.cpp similarity index 96% rename from trick_models/Ball++/L1/src/BallStateDeriv.cpp rename to trick_sims/SIM_Ball++_L1/models/BallStateDeriv.cpp index c52021f3..f365d977 100644 --- a/trick_models/Ball++/L1/src/BallStateDeriv.cpp +++ b/trick_sims/SIM_Ball++_L1/models/BallStateDeriv.cpp @@ -28,10 +28,10 @@ PROGRAMMERS: #include /* Trick include files. */ -#include "sim_services/include/collect_macros.h" +#include "trick/collect_macros.h" /* Model include files. */ -#include "../include/Ball.hh" +#include "Ball.hh" /* ENTRY POINT */ int Ball::state_deriv() /* RETURN: -- Always return zero. */ diff --git a/trick_models/Ball++/L1/src/BallStateInit.cpp b/trick_sims/SIM_Ball++_L1/models/BallStateInit.cpp similarity index 98% rename from trick_models/Ball++/L1/src/BallStateInit.cpp rename to trick_sims/SIM_Ball++_L1/models/BallStateInit.cpp index 10ec870b..7345da16 100644 --- a/trick_models/Ball++/L1/src/BallStateInit.cpp +++ b/trick_sims/SIM_Ball++_L1/models/BallStateInit.cpp @@ -26,7 +26,7 @@ PROGRAMMERS: #include /* Model include files. */ -#include "../include/Ball.hh" +#include "Ball.hh" /* ENTRY POINT */ int Ball::state_init() /* RETURN: -- Always return zero. */ diff --git a/trick_models/Ball++/L1/src/BallStateInteg.cpp b/trick_sims/SIM_Ball++_L1/models/BallStateInteg.cpp similarity index 95% rename from trick_models/Ball++/L1/src/BallStateInteg.cpp rename to trick_sims/SIM_Ball++_L1/models/BallStateInteg.cpp index d3a0c2c2..0a3a68d3 100644 --- a/trick_models/Ball++/L1/src/BallStateInteg.cpp +++ b/trick_sims/SIM_Ball++_L1/models/BallStateInteg.cpp @@ -27,8 +27,8 @@ PROGRAMMERS: /* Model include files. */ #include -#include "sim_services/Integrator/include/integrator_c_intf.h" -#include "../include/Ball.hh" +#include "trick/integrator_c_intf.h" +#include "Ball.hh" #include /* ENTRY POINT */ diff --git a/trick_models/Ball++/L1/src/BallStatePrint.cpp b/trick_sims/SIM_Ball++_L1/models/BallStatePrint.cpp similarity index 87% rename from trick_models/Ball++/L1/src/BallStatePrint.cpp rename to trick_sims/SIM_Ball++_L1/models/BallStatePrint.cpp index a5601964..bd6f2cd0 100644 --- a/trick_models/Ball++/L1/src/BallStatePrint.cpp +++ b/trick_sims/SIM_Ball++_L1/models/BallStatePrint.cpp @@ -28,10 +28,10 @@ PROGRAMMERS: #include /* Model include files. */ -#include "../include/Ball.hh" -#include "sim_services/Executive/include/exec_proto.hh" -#include "sim_services/Executive/include/exec_proto.h" -#include "sim_services/Message/include/message_proto.h" +#include "Ball.hh" +#include "trick/exec_proto.hh" +#include "trick/exec_proto.h" +#include "trick/message_proto.h" /* ENTRY POINT */ int Ball::state_print() { diff --git a/trick_models/Ball++/L1/src/BallState_default_data.cpp b/trick_sims/SIM_Ball++_L1/models/BallState_default_data.cpp similarity index 90% rename from trick_models/Ball++/L1/src/BallState_default_data.cpp rename to trick_sims/SIM_Ball++_L1/models/BallState_default_data.cpp index 06861185..4c83125a 100644 --- a/trick_models/Ball++/L1/src/BallState_default_data.cpp +++ b/trick_sims/SIM_Ball++_L1/models/BallState_default_data.cpp @@ -27,9 +27,9 @@ PROGRAMMERS: #include /* Model include files. */ -#include "trick_utils/units/include/constant.h" -#include "../include/BallState.hh" -#include "sim_services/MemoryManager/include/memorymanager_c_intf.h" +#include "BallState.hh" +#include "trick/constant.h" +#include "trick/memorymanager_c_intf.h" /* ENTRY POINT */ int BallState::default_data() {