Skip to content

Commit

Permalink
Move stuff around, fix headers
Browse files Browse the repository at this point in the history
  • Loading branch information
@flomnes
flomnes committed Sep 19, 2023
1 parent 6556618 commit 66678b8
Show file tree
Hide file tree
Showing 110 changed files with 104 additions and 104 deletions.
2 changes: 1 addition & 1 deletion src/antares-deps
Submodule antares-deps updated 1 files
+1 −1 CMakeLists.txt
5 changes: 0 additions & 5 deletions src/libs/antares/study/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,3 @@ target_include_directories(study
${CMAKE_CURRENT_SOURCE_DIR}/../.. #Dirty trick to allow inclusion via <antares/study/X>
# Make more than just study visible but it's the lesser evil for now
)

# TODO when removing the UI, also remove this directory & target
if(BUILD_UI)
add_subdirectory(action)
endif()
2 changes: 1 addition & 1 deletion src/tests/resources/Antares_Simulator_Tests
Submodule Antares_Simulator_Tests updated from 5c90bb to 2d7916
1 change: 1 addition & 0 deletions src/ui/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ endif()

add_subdirectory(common) #All UI libraries
add_subdirectory(simulator) #Simulator application
add_subdirectory(action) #Async action handler

49 changes: 27 additions & 22 deletions src/libs/antares/study/action/CMakeLists.txt → src/ui/action/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set(SRC_STUDY_ACTIONS_HANDLER_ANTARES_STUDY_AREA
handler/antares-study/area/create.h
handler/antares-study/area/create.hxx
include/action/handler/antares-study/area/create.h
include/action/handler/antares-study/area/create.hxx
handler/antares-study/area/create.cpp
handler/antares-study/area/position.h
handler/antares-study/area/position.cpp
Expand Down Expand Up @@ -35,8 +35,8 @@ set(SRC_STUDY_ACTIONS_HANDLER_ANTARES_STUDY_AREA
source_group("study\\actions\\handler\\antares study\\area" FILES ${SRC_STUDY_ACTIONS_HANDLER_ANTARES_STUDY_AREA})

set(SRC_STUDY_ACTIONS_HANDLER_ANTARES_STUDY_LINK
handler/antares-study/link/create.h
handler/antares-study/link/create.hxx
include/action/handler/antares-study/link/create.h
include/action/handler/antares-study/link/create.hxx
handler/antares-study/link/create.cpp
handler/antares-study/link/ntc.h
handler/antares-study/link/ntc.cpp
Expand Down Expand Up @@ -70,8 +70,8 @@ source_group("study\\action\\handler\\sntares study\\thermal cluster" FILES ${SR


set(SRC_STUDY_ACTIONS_HANDLER_ANTARES_STUDY_CONSTRAINT
handler/antares-study/constraint/create.h
handler/antares-study/constraint/create.hxx
include/action/handler/antares-study/constraint/create.h
include/action/handler/antares-study/constraint/create.hxx
handler/antares-study/constraint/create.cpp
handler/antares-study/constraint/comments.h
handler/antares-study/constraint/comments.hxx
Expand All @@ -90,29 +90,29 @@ set(SRC_STUDY_ACTIONS_HANDLER_ANTARES_STUDY_CONSTRAINT
source_group("study\\action\\handler\\antares study\\constraint" FILES ${SRC_STUDY_ACTIONS_HANDLER_ANTARES_STUDY_CONSTRAINT})

set(SRC_STUDY_ACTIONS
fwd.h
action.h
action.hxx
include/action/fwd.h
include/action/action.h
include/action/action.hxx
action.cpp
text.h
text.hxx
settings/suffix-for-area-names.h
settings/suffix-for-area-names.hxx
include/action/text.h
include/action/text.hxx
include/action/settings/suffix-for-area-names.h
include/action/settings/suffix-for-area-names.hxx
settings/suffix-for-area-names.cpp
settings/suffix-for-cluster-names.h
settings/suffix-for-cluster-names.hxx
include/action/settings/suffix-for-cluster-names.h
include/action/settings/suffix-for-cluster-names.hxx
settings/suffix-for-cluster-names.cpp
settings/suffix-for-constraint-names.h
settings/suffix-for-constraint-names.hxx
include/action/settings/suffix-for-constraint-names.h
include/action/settings/suffix-for-constraint-names.hxx
settings/suffix-for-constraint-names.cpp
settings/decal-area-position.h
settings/decal-area-position.hxx
include/action/settings/decal-area-position.h
include/action/settings/decal-area-position.hxx
settings/decal-area-position.cpp
behavior.h
include/action/behavior.h
behavior.cpp
state.h
include/action/state.h
state.cpp
context.h
include/action/context.h
context.cpp)
source_group("study\\actions" FILES ${SRC_STUDY_ACTIONS})

Expand All @@ -136,4 +136,9 @@ target_link_libraries(antares-action
Antares::study
)

target_include_directories(antares-action
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/include
)

add_library(Antares::action ALIAS antares-action)
4 changes: 2 additions & 2 deletions src/libs/antares/study/action/action.cpp → src/ui/action/action.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions
*/

#include "action.h"
#include "../../antares.h"
#include <action/action.h>
#include <antares/antares.h>

using namespace Yuni;

Expand Down
2 changes: 1 addition & 1 deletion src/libs/antares/study/action/behavior.cpp → src/ui/action/behavior.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/

#include <yuni/yuni.h>
#include "behavior.h"
#include <action/behavior.h>
#include <cassert>

namespace Antares
Expand Down
2 changes: 1 addition & 1 deletion src/libs/antares/study/action/context.cpp → src/ui/action/context.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions
*/

#include "context.h"
#include <action/context.h>

using namespace Yuni;

Expand Down
0 ...ares-study/area/allocation-hydro-post.cpp → ...ares-study/area/allocation-hydro-post.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ntares-study/area/allocation-hydro-post.h → ...ntares-study/area/allocation-hydro-post.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_ALLOCATION_HYDRO_POST_H__

#include <yuni/yuni.h>
#include "../../../action.h"
#include <action/action.h>

namespace Antares
{
Expand Down
0 ...ares-study/area/allocation-hydro-post.hxx → ...ares-study/area/allocation-hydro-post.hxx
View file
File renamed without changes.
0 ...r/antares-study/area/allocation-hydro.cpp → ...r/antares-study/area/allocation-hydro.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ler/antares-study/area/allocation-hydro.h → ...ler/antares-study/area/allocation-hydro.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_ALLOCATION_HYDRO_H__

#include <yuni/yuni.h>
#include "../../../action.h"
#include <action/action.h>

namespace Antares
{
Expand Down
0 ...tion/handler/antares-study/area/color.cpp → ...tion/handler/antares-study/area/color.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...action/handler/antares-study/area/color.h → ...action/handler/antares-study/area/color.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_COLOR_H__

#include <yuni/yuni.h>
#include "../../../action.h"
#include <action/action.h>

namespace Antares
{
Expand Down
0 ...r/antares-study/area/correlation-post.cpp → ...r/antares-study/area/correlation-post.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ler/antares-study/area/correlation-post.h → ...ler/antares-study/area/correlation-post.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_CORRELATION_POST_H__

#include <yuni/yuni.h>
#include "../../../action.h"
#include <action/action.h>

namespace Antares
{
Expand Down
0 ...r/antares-study/area/correlation-post.hxx → ...r/antares-study/area/correlation-post.hxx
View file
File renamed without changes.
0 ...andler/antares-study/area/correlation.cpp → ...andler/antares-study/area/correlation.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion .../handler/antares-study/area/correlation.h → .../handler/antares-study/area/correlation.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_CORRELATION_H__

#include <yuni/yuni.h>
#include "../../../action.h"
#include <action/action.h>

namespace Antares
{
Expand Down
2 changes: 1 addition & 1 deletion ...ion/handler/antares-study/area/create.cpp → ...ion/handler/antares-study/area/create.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions
*/

#include "create.h"
#include <action/handler/antares-study/area/create.h>
#include <antares/utils/utils.h>
#include "nodal-optimization.h"
#include "reserves.h"
Expand Down
0 .../handler/antares-study/area/filtering.cpp → .../handler/antares-study/area/filtering.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...on/handler/antares-study/area/filtering.h → ...on/handler/antares-study/area/filtering.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_FILTERING_H__

#include <yuni/yuni.h>
#include "../../../action.h"
#include <action/action.h>

namespace Antares
{
Expand Down
0 ...n/handler/antares-study/area/misc-gen.cpp → ...n/handler/antares-study/area/misc-gen.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ion/handler/antares-study/area/misc-gen.h → ...ion/handler/antares-study/area/misc-gen.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_MISC_GEN_H__

#include <yuni/yuni.h>
#include "../../../action.h"
#include <action/action.h>

namespace Antares
{
Expand Down
0 ...antares-study/area/nodal-optimization.cpp → ...antares-study/area/nodal-optimization.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...r/antares-study/area/nodal-optimization.h → ...r/antares-study/area/nodal-optimization.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_NODAL_OPTIMIZATION_H__

#include <yuni/yuni.h>
#include "../../../action.h"
#include <action/action.h>

namespace Antares
{
Expand Down
0 ...n/handler/antares-study/area/position.cpp → ...n/handler/antares-study/area/position.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ion/handler/antares-study/area/position.h → ...ion/handler/antares-study/area/position.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_POSITION_H__

#include <yuni/yuni.h>
#include "../../../action.h"
#include <action/action.h>

namespace Antares
{
Expand Down
0 ...n/handler/antares-study/area/reserves.cpp → ...n/handler/antares-study/area/reserves.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ion/handler/antares-study/area/reserves.h → ...ion/handler/antares-study/area/reserves.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_RESERVES_H__

#include <yuni/yuni.h>
#include "../../../action.h"
#include <action/action.h>

namespace Antares
{
Expand Down
0 ...handler/antares-study/area/timeseries.cpp → ...handler/antares-study/area/timeseries.cpp
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...n/handler/antares-study/area/timeseries.h → ...n/handler/antares-study/area/timeseries.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
#define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_TIMESERIES_H__

#include <yuni/yuni.h>
#include "../../../action.h"
#include "../../../../fwd.h"
#include <action/action.h>
#include <antares/study/fwd.h>

namespace Antares
{
Expand Down
2 changes: 1 addition & 1 deletion ...ndler/antares-study/area/ts-generator.cpp → ...ndler/antares-study/area/ts-generator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/

#include "ts-generator.h"
#include "antares/study/parts/load/prepro.h"
#include <antares/study/parts/load/prepro.h>

using namespace Yuni;

Expand Down
4 changes: 2 additions & 2 deletions ...handler/antares-study/area/ts-generator.h → ...handler/antares-study/area/ts-generator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
#define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_TS_GENERATOR_H__

#include <yuni/yuni.h>
#include "../../../action.h"
#include "../../../../fwd.h"
#include <action/action.h>
#include <antares/study/fwd.h>

namespace Antares
{
Expand Down
2 changes: 1 addition & 1 deletion ...on/handler/antares-study/area/ts-node.cpp → ...on/handler/antares-study/area/ts-node.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/

#include "ts-node.h"
#include "../../../../fwd.h"
#include <antares/study/fwd.h>

using namespace Yuni;

Expand Down
4 changes: 2 additions & 2 deletions ...tion/handler/antares-study/area/ts-node.h → ...tion/handler/antares-study/area/ts-node.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
#define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_TS_NODE_H__

#include <yuni/yuni.h>
#include "../../../action.h"
#include "../../../../fwd.h"
#include <action/action.h>
#include <antares/study/fwd.h>

namespace Antares
{
Expand Down
0 ...on/handler/antares-study/area/ts-node.hxx → ...on/handler/antares-study/area/ts-node.hxx
View file
File renamed without changes.
0 ...ler/antares-study/constraint/comments.cpp → ...ler/antares-study/constraint/comments.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ndler/antares-study/constraint/comments.h → ...ndler/antares-study/constraint/comments.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_CONSTRAINT_COMMENTS_H__

#include <yuni/yuni.h>
#include "../../../action.h"
#include <action/action.h>

namespace Antares
{
Expand Down
0 ...ler/antares-study/constraint/comments.hxx → ...ler/antares-study/constraint/comments.hxx
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ndler/antares-study/constraint/create.cpp → ...ndler/antares-study/constraint/create.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions
*/

#include "create.h"
#include <action/handler/antares-study/constraint/create.h>
#include <memory>
#include <antares/study/study.h>
#include "antares/study/fwd.h"
Expand Down
0 ...handler/antares-study/constraint/data.cpp → ...handler/antares-study/constraint/data.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...n/handler/antares-study/constraint/data.h → ...n/handler/antares-study/constraint/data.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_CONSTRAINT_DATA_H__

#include <yuni/yuni.h>
#include "../../../action.h"
#include <action/action.h>

namespace Antares
{
Expand Down
0 ...handler/antares-study/constraint/data.hxx → ...handler/antares-study/constraint/data.hxx
View file
File renamed without changes.
0 ...dler/antares-study/constraint/enabled.cpp → ...dler/antares-study/constraint/enabled.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...andler/antares-study/constraint/enabled.h → ...andler/antares-study/constraint/enabled.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_CONSTRAINT_ENABLED_H__

#include <yuni/yuni.h>
#include "../../../action.h"
#include <action/action.h>

namespace Antares
{
Expand Down
0 ...dler/antares-study/constraint/enabled.hxx → ...dler/antares-study/constraint/enabled.hxx
View file
File renamed without changes.
0 ...dler/antares-study/constraint/offsets.cpp → ...dler/antares-study/constraint/offsets.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...andler/antares-study/constraint/offsets.h → ...andler/antares-study/constraint/offsets.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_CONSTRAINT_OFFSETS_H__

#include <yuni/yuni.h>
#include "../../../action.h"
#include <action/action.h>

namespace Antares
{
Expand Down
0 ...dler/antares-study/constraint/weights.cpp → ...dler/antares-study/constraint/weights.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...andler/antares-study/constraint/weights.h → ...andler/antares-study/constraint/weights.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_CONSTRAINT_WEIGHTS_H__

#include <yuni/yuni.h>
#include "../../../action.h"
#include <action/action.h>

namespace Antares
{
Expand Down
0 ...n/handler/antares-study/link/comments.cpp → ...n/handler/antares-study/link/comments.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ion/handler/antares-study/link/comments.h → ...ion/handler/antares-study/link/comments.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_LINK_COMMENTS_H__

#include <yuni/yuni.h>
#include "../../../action.h"
#include <action/action.h>

namespace Antares
{
Expand Down
0 ...n/handler/antares-study/link/comments.hxx → ...n/handler/antares-study/link/comments.hxx
View file
File renamed without changes.
0 ...ndler/antares-study/link/copper-plate.cpp → ...ndler/antares-study/link/copper-plate.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...handler/antares-study/link/copper-plate.h → ...handler/antares-study/link/copper-plate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREA_COPPERPLATE_H__

#include <yuni/yuni.h>
#include "../../../action.h"
#include <action/action.h>

namespace Antares
{
Expand Down
2 changes: 1 addition & 1 deletion ...ion/handler/antares-study/link/create.cpp → ...ion/handler/antares-study/link/create.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions
*/

#include "create.h"
#include <action/handler/antares-study/link/create.h>
#include <antares/study/study.h>
#include "ntc.h"
#include "hurdles-cost.h"
Expand Down
0 .../handler/antares-study/link/filtering.cpp → .../handler/antares-study/link/filtering.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...on/handler/antares-study/link/filtering.h → ...on/handler/antares-study/link/filtering.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_LINK_FILTERING_H__

#include <yuni/yuni.h>
#include "../../../action.h"
#include <action/action.h>

namespace Antares
{
Expand Down
2 changes: 1 addition & 1 deletion ...ndler/antares-study/link/hurdles-cost.cpp → ...ndler/antares-study/link/hurdles-cost.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/

#include "hurdles-cost.h"
#include "../../../../area/constants.h"
#include <antares/study/area/constants.h>

namespace Antares
{
Expand Down
2 changes: 1 addition & 1 deletion ...handler/antares-study/link/hurdles-cost.h → ...handler/antares-study/link/hurdles-cost.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define __ANTARES_LIBS_STUDY_ACTION_HANDLER_ANTARES_AREAHURDLES_COST_H__

#include <yuni/yuni.h>
#include "../../../action.h"
#include <action/action.h>

namespace Antares
{
Expand Down
Loading

0 comments on commit 66678b8

Please sign in to comment.