diff --git a/.github/workflows/CMake-CI.yml b/.github/workflows/CMake-CI.yml index 0ea1a70..749a957 100644 --- a/.github/workflows/CMake-CI.yml +++ b/.github/workflows/CMake-CI.yml @@ -18,26 +18,26 @@ jobs: # # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list. matrix: - os: [ubuntu-latest, windows-latest] + os: [windows-latest] #, ubuntu-latest] build_type: [Release] c_compiler: [gcc, clang, cl] include: - os: windows-latest c_compiler: cl cpp_compiler: cl - - os: ubuntu-latest - c_compiler: gcc - cpp_compiler: g++ - - os: ubuntu-latest - c_compiler: clang - cpp_compiler: clang++ + # - os: ubuntu-latest + # c_compiler: gcc + # cpp_compiler: g++ + # - os: ubuntu-latest + # c_compiler: clang + # cpp_compiler: clang++ exclude: - os: windows-latest c_compiler: gcc - os: windows-latest c_compiler: clang - - os: ubuntu-latest - c_compiler: cl + # - os: ubuntu-latest + # c_compiler: cl steps: - uses: actions/checkout@v3 diff --git a/table/OrderedTable/test/CMakeLists.txt b/table/OrderedTable/test/CMakeLists.txt index b88f36e..86b5e6c 100644 --- a/table/OrderedTable/test/CMakeLists.txt +++ b/table/OrderedTable/test/CMakeLists.txt @@ -7,4 +7,4 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty") add_executable(${test} ${srcs} ${hdrs}) target_link_libraries(${test} ${include} gtest) set_target_properties(${test} PROPERTIES FOLDER table/${nameBaseProj}) -add_test(${nameBaseProj}_gtest ${CMAKE_BINARY_DIR}/bin/${test}) +#add_test(${nameBaseProj}_gtest ${CMAKE_BINARY_DIR}/bin/${test}) diff --git a/table/OrderedTable/test/test_vectorTable.cpp b/table/OrderedTable/test/test_orderedTable.cpp similarity index 61% rename from table/OrderedTable/test/test_vectorTable.cpp rename to table/OrderedTable/test/test_orderedTable.cpp index 2b9db8a..27ec167 100644 --- a/table/OrderedTable/test/test_vectorTable.cpp +++ b/table/OrderedTable/test/test_orderedTable.cpp @@ -1,3 +1,2 @@ #include -#include "VectorTable.h" using namespace std; diff --git a/table/OrderedTable/test/test_polinom.cpp b/table/OrderedTable/test/test_polinom.cpp deleted file mode 100644 index 948810d..0000000 --- a/table/OrderedTable/test/test_polinom.cpp +++ /dev/null @@ -1,122 +0,0 @@ -#include -#include "Polinom.h" -using namespace std; - -TEST(TPolinom, test1) -{ - TPolinom P, Q, res; - - int deg1[] = { 5, 2, 5 }; - int deg2[] = { 4, 3, 3 }; - int deg3[] = { 3, 5, 1 }; - int deg4[] = { 3, 2, 6 }; - int deg5[] = { 2, 1, 8 }; - - P.AddMonom(TMonom(3, 3, deg1)); - P.AddMonom(TMonom(-5, 3, deg2)); - P.AddMonom(TMonom(7, 3, deg3)); - - Q.AddMonom(TMonom(4, 3, deg4)); - Q.AddMonom(TMonom(-6, 3, deg5)); - - res.AddMonom(TMonom(3, 3, deg1)); - res.AddMonom(TMonom(-5, 3, deg2)); - res.AddMonom(TMonom(7, 3, deg3)); - res.AddMonom(TMonom(4, 3, deg4)); - res.AddMonom(TMonom(-6, 3, deg5)); - - ASSERT_EQ(res, P + Q); -} - -TEST(TPolinom, test2) -{ - TPolinom P, Q, res; - - int deg1[] = {5, 2, 5}; - int deg2[] = {4, 3, 3}; - int deg3[] = {3, 5, 1}; - int deg4[] = {7, 2, 6}; - int deg5[] = {6, 1, 8}; - - P.AddMonom(TMonom(3, 3, deg1)); - P.AddMonom(TMonom(-5, 3, deg2)); - P.AddMonom(TMonom(7, 3, deg3)); - - Q.AddMonom(TMonom(4, 3, deg4)); - Q.AddMonom(TMonom(-6, 3, deg5)); - - res.AddMonom(TMonom(3, 3, deg1)); - res.AddMonom(TMonom(-5, 3, deg2)); - res.AddMonom(TMonom(7, 3, deg3)); - res.AddMonom(TMonom(4, 3, deg4)); - res.AddMonom(TMonom(-6, 3, deg5)); - - ASSERT_EQ(res, P + Q); -} - -TEST(TPolinom, test3) -{ - TPolinom P, Q, res; - - int deg1[] = {5, 2, 5}; - int deg2[] = {4, 3, 3}; - int deg3[] = {3, 5, 1}; - - P.AddMonom(TMonom(3, 3, deg1)); - P.AddMonom(TMonom(-5, 3, deg2)); - P.AddMonom(TMonom(7, 3, deg3)); - - Q.AddMonom(TMonom(4, 3, deg1)); - Q.AddMonom(TMonom(-6, 3, deg2)); - - res.AddMonom(TMonom(3, 3, deg1)); - res.AddMonom(TMonom(-5, 3, deg2)); - res.AddMonom(TMonom(7, 3, deg3)); - res.AddMonom(TMonom(4, 3, deg1)); - res.AddMonom(TMonom(-6, 3, deg2)); - - ASSERT_EQ(res, P + Q); -} - -TEST(TPolinom, test4) -{ - TPolinom P, Q, res; - - int deg1[] = {5, 2, 5}; - int deg2[] = {4, 3, 3}; - int deg3[] = {3, 5, 1}; - int deg4[] = {6, 2, 6}; - - int deg5[] = {2, 1, 8}; - P.AddMonom(TMonom(3, 3, deg1)); - P.AddMonom(TMonom(-5, 3, deg2)); - P.AddMonom(TMonom(7, 3, deg3)); - - Q.AddMonom(TMonom(4, 3, deg1)); - Q.AddMonom(TMonom(-6, 3, deg2)); - - res.AddMonom(TMonom(3, 3, deg1)); - res.AddMonom(TMonom(-5, 3, deg2)); - res.AddMonom(TMonom(7, 3, deg3)); - res.AddMonom(TMonom(4, 3, deg1)); - res.AddMonom(TMonom(-6, 3, deg2)); - - ASSERT_EQ(res, P + Q); -} - -TEST(TPolinom, test5) -{ - TPolinom P, Q, res; - - int deg1[] = {5, 2, 5}; - int deg2[] = {4, 3, 3}; - int deg3[] = {7, 5, 1}; - - P.AddMonom(TMonom(3, 3, deg1)); - P.AddMonom(TMonom(-5, 3, deg2)); - P.AddMonom(TMonom(7, 3, deg3)); - - Q = P * -1.0; - - ASSERT_EQ(res, P + Q); -} diff --git a/table/VectorTable/test/CMakeLists.txt b/table/VectorTable/test/CMakeLists.txt index b88f36e..86b5e6c 100644 --- a/table/VectorTable/test/CMakeLists.txt +++ b/table/VectorTable/test/CMakeLists.txt @@ -7,4 +7,4 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty") add_executable(${test} ${srcs} ${hdrs}) target_link_libraries(${test} ${include} gtest) set_target_properties(${test} PROPERTIES FOLDER table/${nameBaseProj}) -add_test(${nameBaseProj}_gtest ${CMAKE_BINARY_DIR}/bin/${test}) +#add_test(${nameBaseProj}_gtest ${CMAKE_BINARY_DIR}/bin/${test}) diff --git a/table/VectorTable/test/test_vectorTable.cpp b/table/VectorTable/test/test_vectorTable.cpp index 2b9db8a..e5ca44a 100644 --- a/table/VectorTable/test/test_vectorTable.cpp +++ b/table/VectorTable/test/test_vectorTable.cpp @@ -1,3 +1,7 @@ #include #include "VectorTable.h" using namespace std; + +TEST(VectorTable, test1) { + SUCCEED(); +}