From 8b5f80d6dc0b585415765d112e19be4bdffbebfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A8=D0=B8=D1=88=D0=BE=D0=B2=20=D0=9C=D0=B0=D0=BA=D1=81?= =?UTF-8?q?=D0=B8=D0=BC=20=D0=94=D0=B5=D0=BD=D0=B8=D1=81=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=87?= Date: Thu, 10 Sep 2020 17:48:16 +0300 Subject: [PATCH] bug fixes --- CMakeLists.txt.user | 1175 ++++++++++++++++++++++++++++++ tests/math/testpimathmatrix.cpp | 26 +- tests/math/testpimathmatrixt.cpp | 12 +- 3 files changed, 1194 insertions(+), 19 deletions(-) create mode 100644 CMakeLists.txt.user diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user new file mode 100644 index 00000000..aed2b6b3 --- /dev/null +++ b/CMakeLists.txt.user @@ -0,0 +1,1175 @@ + + + + + + EnvironmentId + {590da41d-e68d-4f0d-9a90-bf433d6b70a5} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt MinGW 64-bit + Desktop Qt MinGW 64-bit + qt.qt5.5127.win64_mingw73_kit + 1 + 0 + 6 + + + CMAKE_BUILD_TYPE:STRING=Debug + CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} + CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} + CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} + QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} + TESTS:BOOL=ON + + D:/build-pip-Desktop_Qt_MinGW_64_bit-Debug + + + + + all + + true + CMakeProjectManager.MakeStep + + 1 + Сборка + Сборка + ProjectExplorer.BuildSteps.Build + + + + + + clean + + true + CMakeProjectManager.MakeStep + + 1 + Очистка + Очистка + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Отладка + CMakeProjectManager.CMakeBuildConfiguration + + + + CMAKE_BUILD_TYPE:STRING=Release + CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} + CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} + CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} + QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} + TESTS:BOOL=ON + + D:/build-pip-Desktop_Qt_MinGW_64_bit-Release + + + + + all + + true + CMakeProjectManager.MakeStep + + 1 + Сборка + Сборка + ProjectExplorer.BuildSteps.Build + + + + + + clean + + true + CMakeProjectManager.MakeStep + + 1 + Очистка + Очистка + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Выпуск + CMakeProjectManager.CMakeBuildConfiguration + + + + CMAKE_BUILD_TYPE:STRING=RelWithDebInfo + CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} + CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} + CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} + QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} + + D:/build-pip-Desktop_Qt_MinGW_64_bit-RelWithDebInfo + + + + + all + + true + CMakeProjectManager.MakeStep + + 1 + Сборка + Сборка + ProjectExplorer.BuildSteps.Build + + + + + + clean + + true + CMakeProjectManager.MakeStep + + 1 + Очистка + Очистка + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Выпуск с отладочной информацией + CMakeProjectManager.CMakeBuildConfiguration + + + + CMAKE_BUILD_TYPE:STRING=MinSizeRel + CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} + CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} + CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} + QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} + + D:/build-pip-Desktop_Qt_MinGW_64_bit-MinSizeRel + + + + + all + + true + CMakeProjectManager.MakeStep + + 1 + Сборка + Сборка + ProjectExplorer.BuildSteps.Build + + + + + + clean + + true + CMakeProjectManager.MakeStep + + 1 + Очистка + Очистка + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Выпуск минимального размера + CMakeProjectManager.CMakeBuildConfiguration + + 4 + + + 0 + Развёртывание + Развёртывание + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + deploy_tool + CMakeProjectManager.CMakeRunConfiguration.deploy_tool + deploy_tool + + false + + false + true + true + false + false + true + + D:/build-pip-Desktop_Qt_MinGW_64_bit-Release/utils/deploy_tool + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + picloud + CMakeProjectManager.CMakeRunConfiguration.picloud + picloud + + false + + false + true + true + false + false + true + + D:/build-pip-Desktop_Qt_MinGW_64_bit-Release/utils/cloud_dispatcher + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + pip_concurrent_test + CMakeProjectManager.CMakeRunConfiguration.pip_concurrent_test + pip_concurrent_test + + false + + false + true + true + false + false + true + + D:/build-pip-Desktop_Qt_MinGW_64_bit-Release + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + pip_math_test + CMakeProjectManager.CMakeRunConfiguration.pip_math_test + pip_math_test + + false + + false + true + true + false + false + true + + D:/build-pip-Desktop_Qt_MinGW_64_bit-Release + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + picrypt + CMakeProjectManager.CMakeRunConfiguration.picrypt + picrypt + + false + + false + true + true + false + false + true + + D:/build-pip-Desktop_Qt_MinGW_64_bit-Release/utils/crypt_tool + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + pift + CMakeProjectManager.CMakeRunConfiguration.pift + pift + + false + + false + true + true + false + false + true + + D:/build-pip-Desktop_Qt_MinGW_64_bit-Release/utils/udp_file_transfer + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + pip_cmg + CMakeProjectManager.CMakeRunConfiguration.pip_cmg + pip_cmg + + false + + false + true + true + false + false + true + + D:/build-pip-Desktop_Qt_MinGW_64_bit-Release/utils/code_model_generator + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + pip_rc + CMakeProjectManager.CMakeRunConfiguration.pip_rc + pip_rc + + false + + false + true + true + false + false + true + + D:/build-pip-Desktop_Qt_MinGW_64_bit-Release/utils/resources_compiler + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + pip_system_test + CMakeProjectManager.CMakeRunConfiguration.pip_system_test + pip_system_test + + false + + false + true + true + false + false + true + + D:/build-pip-Desktop_Qt_MinGW_64_bit-Release/utils/system_test + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + pip_test + CMakeProjectManager.CMakeRunConfiguration.pip_test + pip_test + + false + + false + true + true + false + false + true + + D:/build-pip-Desktop_Qt_MinGW_64_bit-Release + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + pisd + CMakeProjectManager.CMakeRunConfiguration.pisd + pisd + + false + + false + true + true + false + false + true + + D:/build-pip-Desktop_Qt_MinGW_64_bit-Release/utils/system_daemon + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + piterminal + CMakeProjectManager.CMakeRunConfiguration.piterminal + piterminal + + false + + false + true + true + false + false + true + + D:/build-pip-Desktop_Qt_MinGW_64_bit-Release/utils/piterminal + + 12 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/tests/math/testpimathmatrix.cpp b/tests/math/testpimathmatrix.cpp index 6f4e5ffa..3dc1943a 100644 --- a/tests/math/testpimathmatrix.cpp +++ b/tests/math/testpimathmatrix.cpp @@ -16,18 +16,18 @@ bool cmpSquareMatrixWithValue(PIMathMatrix matrix, Type val, int num) { TEST(PIMathMatrix_Test, identity) { auto matrix = PIMathMatrix::identity(3, 3); - for(int i = 0; i < 3; i++){ - if(matrix[i][i] != 1.0){ - ASSERT_TRUE(false); - } - } - for(int i = 0; i < 3; i++){ - for(int j = 0; j < 3; j++){ - if(i != j){ + for(int i = 0; i < 3; i++) { + for(int j = 0; j < 3; j++) { + if(i != j) { if(matrix[i][j] != 0.0){ ASSERT_TRUE(false); } } + else { + if(matrix[i][i] != 1.0){ + ASSERT_TRUE(false); + } + } } } ASSERT_TRUE(true); @@ -35,11 +35,6 @@ TEST(PIMathMatrix_Test, identity) { TEST(PIMathMatrixT_Test, element) { auto matrix = PIMathMatrix::identity(3, 3); - for(uint i = 0; i < 3; i++) { - if(matrix.element(i,i) != 1.0) { - ASSERT_TRUE(false); - } - } for(int i = 0; i < 3; i++){ for(int j = 0; j < 3; j++){ if(i != j){ @@ -47,6 +42,11 @@ TEST(PIMathMatrixT_Test, element) { ASSERT_TRUE(false); } } + else { + if(matrix.element(i,i) != 1.0) { + ASSERT_TRUE(false); + } + } } } ASSERT_TRUE(true); diff --git a/tests/math/testpimathmatrixt.cpp b/tests/math/testpimathmatrixt.cpp index 52bb462e..d7f11563 100644 --- a/tests/math/testpimathmatrixt.cpp +++ b/tests/math/testpimathmatrixt.cpp @@ -19,11 +19,6 @@ bool cmpSquareMatrixWithValue(PIMathMatrixT matrix, Type val TEST(PIMathMatrixT_Test, identity) { auto matrix = PIMathMatrixT::identity(); - for(int i = 0; i < 3; i++){ - if(matrix[i][i] != 1.0){ - ASSERT_TRUE(false); - } - } for(int i = 0; i < 3; i++){ for(int j = 0; j < 3; j++){ if(i != j){ @@ -31,6 +26,11 @@ TEST(PIMathMatrixT_Test, identity) { ASSERT_TRUE(false); } } + else { + if(matrix[i][i] != 1.0){ + ASSERT_TRUE(false); + } + } } } ASSERT_TRUE(true); @@ -293,7 +293,7 @@ TEST(PIMathMatrixT_Test, operator_Not_EqualFalse) { ASSERT_FALSE(matrix1 != matrix2); } -TEST(PIMathMatrixT_Test, operator_Addition_ ssignment) { +TEST(PIMathMatrixT_Test, operator_Addition_Assignment) { auto matrix1 = PIMathMatrixT::filled(6.72) ; auto matrix2 = PIMathMatrixT::filled(1.0) ; matrix1 += matrix2;