Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Jan 5, 2024
1 parent e1716ea commit c6f1db3
Show file tree
Hide file tree
Showing 40 changed files with 33 additions and 66 deletions.
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [

]
}
}
6 changes: 3 additions & 3 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@
{
"name": "debug",
"displayName": "Debug",
"cacheVariables": {
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"EGOA_BUILD_TYPE": "Debug"
}
},
{
"name": "release",
"displayName": "Release",
"cacheVariables": {
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release",
"EGOA_BUILD_TYPE": "Release"
}
Expand All @@ -82,4 +82,4 @@
"inherits": [ "release", "benchmark-base" ]
}
]
}
}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"requests":[{"kind":"cache","version":2},{"kind":"codemodel","version":2},{"kind":"toolchains","version":1},{"kind":"cmakeFiles","version":1}]}
{"requests":[{"kind":"cache","version":2},{"kind":"codemodel","version":2},{"kind":"toolchains","version":1},{"kind":"cmakeFiles","version":1}]}
1 change: 0 additions & 1 deletion out/build/debug/CMakeCache.txt
Original file line number Diff line number Diff line change
Expand Up @@ -873,4 +873,3 @@ ProcessorCount_cmd_sysctl-ADVANCED:INTERNAL=1
_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX:INTERNAL=/usr/local
//Test standard_math_library_linked_to_automatically
standard_math_library_linked_to_automatically:INTERNAL=1

3 changes: 1 addition & 2 deletions out/build/debug/CppAD-prefix/tmp/CppAD-gitclone.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ endif()
set(init_submodules TRUE)
if(init_submodules)
execute_process(
COMMAND "/usr/local/bin/git" submodule update --recursive --init
COMMAND "/usr/local/bin/git" submodule update --recursive --init
WORKING_DIRECTORY "/workspaces/egoa/external/CppAD"
RESULT_VARIABLE error_code
)
Expand All @@ -63,4 +63,3 @@ execute_process(
if(error_code)
message(FATAL_ERROR "Failed to copy script-last-run stamp file: '/workspaces/egoa/out/build/debug/CppAD-prefix/src/CppAD-stamp/CppAD-gitclone-lastrun.txt'")
endif()

3 changes: 1 addition & 2 deletions out/build/debug/CppAD-prefix/tmp/CppAD-gitupdate.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ if(error_code OR is_remote_ref OR NOT ("${tag_sha}" STREQUAL "${head_sha}"))
set(init_submodules TRUE)
if(init_submodules)
execute_process(
COMMAND "/usr/local/bin/git" submodule update --recursive --init
COMMAND "/usr/local/bin/git" submodule update --recursive --init
WORKING_DIRECTORY "/workspaces/egoa/external/CppAD/"
RESULT_VARIABLE error_code
)
Expand All @@ -157,4 +157,3 @@ if(error_code OR is_remote_ref OR NOT ("${tag_sha}" STREQUAL "${head_sha}"))
message(FATAL_ERROR "Failed to update submodules in: '/workspaces/egoa/external/CppAD/'")
endif()
endif()

Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ endif()
set(init_submodules TRUE)
if(init_submodules)
execute_process(
COMMAND "/usr/local/bin/git" submodule update --recursive --init
COMMAND "/usr/local/bin/git" submodule update --recursive --init
WORKING_DIRECTORY "/workspaces/egoa/external/GoogleTestFramework"
RESULT_VARIABLE error_code
)
Expand All @@ -63,4 +63,3 @@ execute_process(
if(error_code)
message(FATAL_ERROR "Failed to copy script-last-run stamp file: '/workspaces/egoa/out/build/debug/GoogleTestFramework-prefix/src/GoogleTestFramework-stamp/GoogleTestFramework-gitclone-lastrun.txt'")
endif()

Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ if(error_code OR is_remote_ref OR NOT ("${tag_sha}" STREQUAL "${head_sha}"))
set(init_submodules TRUE)
if(init_submodules)
execute_process(
COMMAND "/usr/local/bin/git" submodule update --recursive --init
COMMAND "/usr/local/bin/git" submodule update --recursive --init
WORKING_DIRECTORY "/workspaces/egoa/external/GoogleTestFramework/"
RESULT_VARIABLE error_code
)
Expand All @@ -157,4 +157,3 @@ if(error_code OR is_remote_ref OR NOT ("${tag_sha}" STREQUAL "${head_sha}"))
message(FATAL_ERROR "Failed to update submodules in: '/workspaces/egoa/external/GoogleTestFramework/'")
endif()
endif()

8 changes: 4 additions & 4 deletions out/build/debug/_deps/eigen-build/cdashtesting.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ include("${CTEST_SOURCE_DIRECTORY}/CTestConfig.cmake")
foreach(subproject ${CTEST_PROJECT_SUBPROJECTS})
message("")
message("Process ${subproject}")

set_property(GLOBAL PROPERTY SubProject ${subproject})
set_property(GLOBAL PROPERTY Label ${subproject})

Expand All @@ -41,9 +41,9 @@ foreach(subproject ${CTEST_PROJECT_SUBPROJECTS})

ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}" INCLUDE_LABEL "${subproject}" )
# runs only tests that have a LABELS property matching "${subproject}"

ctest_coverage(BUILD "${CTEST_BINARY_DIRECTORY}" LABELS "${subproject}" )

ctest_submit(PARTS Test)

endforeach()
1 change: 0 additions & 1 deletion out/build/debug/_deps/eigen-subbuild/CMakeCache.txt
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,3 @@ CMAKE_UNAME:INTERNAL=/usr/bin/uname
CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
//ADVANCED property for variable: GIT_EXECUTABLE
GIT_EXECUTABLE-ADVANCED:INTERNAL=1

1 change: 0 additions & 1 deletion out/build/debug/_deps/eigen-subbuild/CMakeFiles/Makefile2
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,3 @@ CMakeFiles/eigen-populate.dir/clean:
cmake_check_build_system:
$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sources" :
"sources" :
[
{
"file" : "/workspaces/egoa/out/build/debug/_deps/eigen-subbuild/CMakeFiles/eigen-populate"
Expand Down Expand Up @@ -35,12 +35,12 @@
"file" : "/workspaces/egoa/out/build/debug/_deps/eigen-subbuild/eigen-populate-prefix/src/eigen-populate-stamp/eigen-populate-test.rule"
}
],
"target" :
"target" :
{
"labels" :
"labels" :
[
"eigen-populate"
],
"name" : "eigen-populate"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,3 @@ CMakeFiles/eigen-populate.dir/clean:
CMakeFiles/eigen-populate.dir/depend:
cd /workspaces/egoa/out/build/debug/_deps/eigen-subbuild && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /workspaces/egoa/out/build/debug/_deps/eigen-subbuild /workspaces/egoa/out/build/debug/_deps/eigen-subbuild /workspaces/egoa/out/build/debug/_deps/eigen-subbuild /workspaces/egoa/out/build/debug/_deps/eigen-subbuild /workspaces/egoa/out/build/debug/_deps/eigen-subbuild/CMakeFiles/eigen-populate.dir/DependInfo.cmake --color=$(COLOR)
.PHONY : CMakeFiles/eigen-populate.dir/depend

Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# CMAKE generated file: DO NOT EDIT!
# Generated by "Unix Makefiles" Generator, CMake Version 3.16

Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# CMAKE generated file: DO NOT EDIT!
# Generated by "Unix Makefiles" Generator, CMake Version 3.16

Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ CMAKE_PROGRESS_6 = 6
CMAKE_PROGRESS_7 = 7
CMAKE_PROGRESS_8 = 8
CMAKE_PROGRESS_9 = 9

1 change: 0 additions & 1 deletion out/build/debug/_deps/eigen-subbuild/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,3 @@ help:
cmake_check_build_system:
$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system

Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ endif()
set(init_submodules TRUE)
if(init_submodules)
execute_process(
COMMAND "/usr/local/bin/git" submodule update --recursive --init
COMMAND "/usr/local/bin/git" submodule update --recursive --init
WORKING_DIRECTORY "/workspaces/egoa/external/Eigen"
RESULT_VARIABLE error_code
)
Expand All @@ -63,4 +63,3 @@ execute_process(
if(error_code)
message(FATAL_ERROR "Failed to copy script-last-run stamp file: '/workspaces/egoa/out/build/debug/_deps/eigen-subbuild/eigen-populate-prefix/src/eigen-populate-stamp/eigen-populate-gitclone-lastrun.txt'")
endif()

Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ if(error_code OR is_remote_ref OR NOT ("${tag_sha}" STREQUAL "${head_sha}"))
set(init_submodules TRUE)
if(init_submodules)
execute_process(
COMMAND "/usr/local/bin/git" submodule update --recursive --init
COMMAND "/usr/local/bin/git" submodule update --recursive --init
WORKING_DIRECTORY "/workspaces/egoa/external/Eigen/"
RESULT_VARIABLE error_code
)
Expand All @@ -157,4 +157,3 @@ if(error_code OR is_remote_ref OR NOT ("${tag_sha}" STREQUAL "${head_sha}"))
message(FATAL_ERROR "Failed to update submodules in: '/workspaces/egoa/external/Eigen/'")
endif()
endif()

1 change: 0 additions & 1 deletion out/build/debug/_deps/pypsa-eur-subbuild/CMakeCache.txt
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,3 @@ CMAKE_UNAME:INTERNAL=/usr/bin/uname
CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
//ADVANCED property for variable: GIT_EXECUTABLE
GIT_EXECUTABLE-ADVANCED:INTERNAL=1

Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,3 @@ CMakeFiles/pypsa-eur-populate.dir/clean:
cmake_check_build_system:
$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sources" :
"sources" :
[
{
"file" : "/workspaces/egoa/out/build/debug/_deps/pypsa-eur-subbuild/CMakeFiles/pypsa-eur-populate"
Expand Down Expand Up @@ -35,12 +35,12 @@
"file" : "/workspaces/egoa/out/build/debug/_deps/pypsa-eur-subbuild/pypsa-eur-populate-prefix/src/pypsa-eur-populate-stamp/pypsa-eur-populate-test.rule"
}
],
"target" :
"target" :
{
"labels" :
"labels" :
[
"pypsa-eur-populate"
],
"name" : "pypsa-eur-populate"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,3 @@ CMakeFiles/pypsa-eur-populate.dir/clean:
CMakeFiles/pypsa-eur-populate.dir/depend:
cd /workspaces/egoa/out/build/debug/_deps/pypsa-eur-subbuild && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /workspaces/egoa/out/build/debug/_deps/pypsa-eur-subbuild /workspaces/egoa/out/build/debug/_deps/pypsa-eur-subbuild /workspaces/egoa/out/build/debug/_deps/pypsa-eur-subbuild /workspaces/egoa/out/build/debug/_deps/pypsa-eur-subbuild /workspaces/egoa/out/build/debug/_deps/pypsa-eur-subbuild/CMakeFiles/pypsa-eur-populate.dir/DependInfo.cmake --color=$(COLOR)
.PHONY : CMakeFiles/pypsa-eur-populate.dir/depend

Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# CMAKE generated file: DO NOT EDIT!
# Generated by "Unix Makefiles" Generator, CMake Version 3.16

Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# CMAKE generated file: DO NOT EDIT!
# Generated by "Unix Makefiles" Generator, CMake Version 3.16

Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ CMAKE_PROGRESS_6 = 6
CMAKE_PROGRESS_7 = 7
CMAKE_PROGRESS_8 = 8
CMAKE_PROGRESS_9 = 9

1 change: 0 additions & 1 deletion out/build/debug/_deps/pypsa-eur-subbuild/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,3 @@ help:
cmake_check_build_system:
$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system

Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ endif()
set(init_submodules TRUE)
if(init_submodules)
execute_process(
COMMAND "/usr/local/bin/git" submodule update --recursive --init
COMMAND "/usr/local/bin/git" submodule update --recursive --init
WORKING_DIRECTORY "/workspaces/egoa/data/PowerGrids/PyPSA/pypsa-eur"
RESULT_VARIABLE error_code
)
Expand All @@ -63,4 +63,3 @@ execute_process(
if(error_code)
message(FATAL_ERROR "Failed to copy script-last-run stamp file: '/workspaces/egoa/out/build/debug/_deps/pypsa-eur-subbuild/pypsa-eur-populate-prefix/src/pypsa-eur-populate-stamp/pypsa-eur-populate-gitclone-lastrun.txt'")
endif()

Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ if(error_code OR is_remote_ref OR NOT ("${tag_sha}" STREQUAL "${head_sha}"))
set(init_submodules TRUE)
if(init_submodules)
execute_process(
COMMAND "/usr/local/bin/git" submodule update --recursive --init
COMMAND "/usr/local/bin/git" submodule update --recursive --init
WORKING_DIRECTORY "/workspaces/egoa/data/PowerGrids/PyPSA/pypsa-eur/"
RESULT_VARIABLE error_code
)
Expand All @@ -157,4 +157,3 @@ if(error_code OR is_remote_ref OR NOT ("${tag_sha}" STREQUAL "${head_sha}"))
message(FATAL_ERROR "Failed to update submodules in: '/workspaces/egoa/data/PowerGrids/PyPSA/pypsa-eur/'")
endif()
endif()

Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,3 @@ CMAKE_UNAME:INTERNAL=/usr/bin/uname
CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
//ADVANCED property for variable: GIT_EXECUTABLE
GIT_EXECUTABLE-ADVANCED:INTERNAL=1

Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,3 @@ CMakeFiles/pypsa-iti-collaboration-populate.dir/clean:
cmake_check_build_system:
$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sources" :
"sources" :
[
{
"file" : "/workspaces/egoa/out/build/debug/_deps/pypsa-iti-collaboration-subbuild/CMakeFiles/pypsa-iti-collaboration-populate"
Expand Down Expand Up @@ -35,12 +35,12 @@
"file" : "/workspaces/egoa/out/build/debug/_deps/pypsa-iti-collaboration-subbuild/pypsa-iti-collaboration-populate-prefix/src/pypsa-iti-collaboration-populate-stamp/pypsa-iti-collaboration-populate-test.rule"
}
],
"target" :
"target" :
{
"labels" :
"labels" :
[
"pypsa-iti-collaboration-populate"
],
"name" : "pypsa-iti-collaboration-populate"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,3 @@ CMakeFiles/pypsa-iti-collaboration-populate.dir/clean:
CMakeFiles/pypsa-iti-collaboration-populate.dir/depend:
cd /workspaces/egoa/out/build/debug/_deps/pypsa-iti-collaboration-subbuild && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /workspaces/egoa/out/build/debug/_deps/pypsa-iti-collaboration-subbuild /workspaces/egoa/out/build/debug/_deps/pypsa-iti-collaboration-subbuild /workspaces/egoa/out/build/debug/_deps/pypsa-iti-collaboration-subbuild /workspaces/egoa/out/build/debug/_deps/pypsa-iti-collaboration-subbuild /workspaces/egoa/out/build/debug/_deps/pypsa-iti-collaboration-subbuild/CMakeFiles/pypsa-iti-collaboration-populate.dir/DependInfo.cmake --color=$(COLOR)
.PHONY : CMakeFiles/pypsa-iti-collaboration-populate.dir/depend

Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# CMAKE generated file: DO NOT EDIT!
# Generated by "Unix Makefiles" Generator, CMake Version 3.16

Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# CMAKE generated file: DO NOT EDIT!
# Generated by "Unix Makefiles" Generator, CMake Version 3.16

Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ CMAKE_PROGRESS_6 = 6
CMAKE_PROGRESS_7 = 7
CMAKE_PROGRESS_8 = 8
CMAKE_PROGRESS_9 = 9

Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,3 @@ help:
cmake_check_build_system:
$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system

Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ endif()
set(init_submodules TRUE)
if(init_submodules)
execute_process(
COMMAND "/usr/local/bin/git" submodule update --recursive --init
COMMAND "/usr/local/bin/git" submodule update --recursive --init
WORKING_DIRECTORY "/workspaces/egoa/data/PowerGrids/PyPSA/pypsa-iti-collaboration"
RESULT_VARIABLE error_code
)
Expand All @@ -63,4 +63,3 @@ execute_process(
if(error_code)
message(FATAL_ERROR "Failed to copy script-last-run stamp file: '/workspaces/egoa/out/build/debug/_deps/pypsa-iti-collaboration-subbuild/pypsa-iti-collaboration-populate-prefix/src/pypsa-iti-collaboration-populate-stamp/pypsa-iti-collaboration-populate-gitclone-lastrun.txt'")
endif()

Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ if(error_code OR is_remote_ref OR NOT ("${tag_sha}" STREQUAL "${head_sha}"))
set(init_submodules TRUE)
if(init_submodules)
execute_process(
COMMAND "/usr/local/bin/git" submodule update --recursive --init
COMMAND "/usr/local/bin/git" submodule update --recursive --init
WORKING_DIRECTORY "/workspaces/egoa/data/PowerGrids/PyPSA/pypsa-iti-collaboration/"
RESULT_VARIABLE error_code
)
Expand All @@ -157,4 +157,3 @@ if(error_code OR is_remote_ref OR NOT ("${tag_sha}" STREQUAL "${head_sha}"))
message(FATAL_ERROR "Failed to update submodules in: '/workspaces/egoa/data/PowerGrids/PyPSA/pypsa-iti-collaboration/'")
endif()
endif()

3 changes: 1 addition & 2 deletions out/build/debug/buildtests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ if [ -n "${EIGEN_MAKE_ARGS:+x}" ]
then
/usr/bin/make $targets_to_make ${EIGEN_MAKE_ARGS}
else
/usr/bin/make $targets_to_make
/usr/bin/make $targets_to_make
fi
exit $?

0 comments on commit c6f1db3

Please sign in to comment.