Commit b9d0d44e authored by Tomáš Jakubec's avatar Tomáš Jakubec
Browse files

MeshDataContainerTest

parent 2e482ce2

Unstructured_mesh/Unstructured_mesh.pro

+9 −6
Original line number Diff line number Diff line
@@ -6,10 +6,6 @@ CONFIG -= qt 
INCLUDEPATH += $$PWD/../src/



SOURCES += \

    ../src/UnitTests/Debug/DBGVAR_JSONTest.cpp \

    ../src/UnitTests/Debug/VariableExportTest.cpp \

    ../src/UnitTests/Traits/ArithmeticTraitsTest.cpp \

    ../src/UnitTests/Traits/TraitsTest.cpp \

        main.cpp \



HEADERS += \
@@ -56,9 +52,15 @@ HEADERS += \ 
    ../src/GTMesh/UnstructuredMesh/UnstructuredMesh.h \

    ../src/GTMesh/NumericStaticArray/Vector.h \

    ../src/GTMesh/NumericStaticArray/Vertex.h \

    ../src/GTMesh/UnstructuredMesh/UnstructuredMeshDefine.h

    ../src/GTMesh/UnstructuredMesh/UnstructuredMeshDefine.h \

    ../src/UnitTests/UnstructuredMesh/MeshSetup.h



DISTFILES += \

    ../src/UnitTests/Debug/DBGVAR_JSONTest.cpp \

    ../src/UnitTests/Debug/VariableExportTest.cpp \

    ../src/UnitTests/Traits/ArithmeticTraitsTest.cpp \

    ../src/UnitTests/Traits/TraitsTest.cpp \

    ../src/UnitTests/UnstructuredMesh/MeshDataContainerTest.cpp \

    ../README.md \

    ../src/GTMesh/Debug/README.md \

    ../src/GTMesh/Traits/TraitsAlgorithm/README.md \
@@ -66,4 +68,5 @@ DISTFILES += \ 
    ../src/UnitTests/CMakeLists.txt \

    ../src/UnitTests/Debug/CMakeLists.txt \

    ../src/UnitTests/README.md \

    ../src/UnitTests/Traits/CMakeLists.txt
 
    ../src/UnitTests/Traits/CMakeLists.txt \

    ../src/UnitTests/UnstructuredMesh/CMakeLists.txt

Unstructured_mesh/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1092,7 +1092,7 @@ int main() 
    //testMesh3D();

    //test3DMeshDeformedPrisms();

    //testMeshRefine();

    //testMeshDataContainer();

    testMeshDataContainer();

    //UnstructuredMesh<5, size_t, double, 6,5,4> m;

    //m.ComputeElementMeasures();

    test3DMeshLoad();

src/UnitTests/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ include(BuildGtest) 
include_directories(${CMAKE_SOURCE_DIR}/..)

add_subdirectory( Debug )

add_subdirectory( Traits )

add_subdirectory( UnstructuredMesh )



## below are targets for each test

add_executable( MyTest MyTest.cpp )

src/UnitTests/Traits/ArithmeticTraitsTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ struct NumStruct { 
    auto& operator[](std::integer_sequence<unsigned int, Idxs...>){

        return get<Idxs...>(*this);

    }

    auto operator== (const NumStruct& rhs){

    auto operator== (const NumStruct& rhs) const {

        return fabs(data1 - rhs.data1) < 1e-5 &&

               fabs(data1 - rhs.data1) < 1e-5;

    }
@@ -34,8 +34,8 @@ TEST( ArithmeticTraitsTest, basicTest ) 




    EXPECT_EQ(log(ns), NumStruct(3.04452,2.70805));

    EXPECT_EQ(pow(ns, 2), NumStruct(21*21,15*15));

    EXPECT_EQ(sqrt(ns, 2), NumStruct(sqrt(21),sqrt(15)));

    EXPECT_EQ((pow(ns, 2)), NumStruct(21*21,15*15));

    EXPECT_EQ(sqrt(ns), NumStruct(sqrt(21),sqrt(15)));



    EXPECT_EQ(-ns, NumStruct(-21,-15));

    EXPECT_EQ(abs(-ns), NumStruct(21,15));

src/UnitTests/Traits/TraitsTest.cpp

+8 −6
Original line number Diff line number Diff line
@@ -59,13 +59,15 @@ TEST( TupleTraitsTest, basicTest ) 


    std::tuple<double> t{1.5};

    Traits<std::tuple<double>>::getTraits().getAttr<0>(t) = 2.5;

    EXPECT_FLOAT_EQ(Traits<std::tuple<double>>::getTraits().getAttr<0>(t), 2.5);

    EXPECT_EQ(Traits<std::tuple<double>>::getTraits().getAttr<0>(t), 2.5);

}





template< typename Real, size_t len >

class TemplateClass{

    std::array<Real, len> arr;



    friend class Traits<TemplateClass<Real, len>>;

};



MAKE_ATTRIBUTE_TEMPLATE_TRAIT( (TemplateClass<Real, len>),
@@ -75,16 +77,16 @@ MAKE_ATTRIBUTE_TEMPLATE_TRAIT( (TemplateClass<Real, len>), 
TEST( TemplateTraitsTest, basicTest )

{

    TemplateClass<double, 3> tc;

    tc.arr = {1.5,2.5,3.5};

    Traits<TemplateClass<double, 3>>::getTraits().getAttr<0>(tc) = {1.5,2.5,3.5};



    EXPECT_TRUE((HasDefaultTraits<TemplateClass<double, 3>>::value));

    EXPECT_TRUE((HasDefaultTraits<TemplateClass<int, 5>>::value));

    EXPECT_TRUE((IsDirectAccess<Traits<TemplateClass<int, 5>>::traitsType::memRefType<0>>::value));



    EXPECT_EQ(Traits<TemplateClass<int, 5>>::size(), 1);

    EXPECT_EQ(Traits<TemplateClass<int, 5>>::getTraits().name<0>, "arr");

    EXPECT_EQ(Traits<TemplateClass<double, 3>>::getTraits().getValue<0>(tc), std::array<double, 3>{1.5,2.5,3.5});

    EXPECT_EQ((Traits<TemplateClass<int, 5>>::size()), 1);

    EXPECT_EQ((Traits<TemplateClass<int, 5>>::getTraits().getName<0>()), "arr");

    EXPECT_EQ((Traits<TemplateClass<double, 3>>::getTraits().getValue<0>(tc)), (std::array<double, 3>{1.5,2.5,3.5}));

}

#endif

// #endif



#include "UnitTests/main.h"