Renaming Ellpack network to indexed multimap.

src/CMakeLists.txt

@@ -5,7 +5,6 @@ ADD_SUBDIRECTORY( core )
 ADD_SUBDIRECTORY( debug )
 ADD_SUBDIRECTORY( matrices )
 ADD_SUBDIRECTORY( mesh )
-ADD_SUBDIRECTORY( networks )
 ADD_SUBDIRECTORY( operators )
 ADD_SUBDIRECTORY( problems )
 ADD_SUBDIRECTORY( solvers )

src/core/CMakeLists.txt

@@ -2,6 +2,7 @@ ADD_SUBDIRECTORY( arrays )
 ADD_SUBDIRECTORY( containers )
 ADD_SUBDIRECTORY( cuda )
 ADD_SUBDIRECTORY( vectors )
+ADD_SUBDIRECTORY( multimaps )
 
 set (headers tnlAssert.h               
              tnlConstants.h

src/networks/CMakeLists.txt → src/core/multimaps/CMakeLists.txt

-SET( headers tnlEllpackNetwork.h
-             tnlEllpackNetwork_impl.h
-             tnlEllpackNetworkPorts.h
-             tnlEllpackNetworkPorts_impl.h )
+SET( headers tnlEllpackIndexMultimap.h
+             tnlEllpackIndexMultimap_impl.h
+             tnlEllpackIndexMultimapValues.h
+             tnlEllpackIndexMultimapValues_impl.h )
 
-SET( CURRENT_DIR ${CMAKE_SOURCE_DIR}/src/networks )
+SET( CURRENT_DIR ${CMAKE_SOURCE_DIR}/src/core/multimaps )
 set( common_SOURCES
       )       
 
 IF( BUILD_CUDA )
-   set( tnl_networks_CUDA__SOURCES
+   set( tnl_core_multimaps_CUDA__SOURCES
         ${common_SOURCES}      
         PARENT_SCOPE )
 ENDIF()    
 
-set( tnl_networks_SOURCES     
+set( tnl_core_multimaps_SOURCES     
      ${common_SOURCES}
      PARENT_SCOPE )
         
-INSTALL( FILES ${headers} DESTINATION include/tnl-${tnlVersion}/networks )
\ No newline at end of file
+INSTALL( FILES ${headers} DESTINATION include/tnl-${tnlVersion}/core/multimaps )
\ No newline at end of file

src/networks/tnlEllpackNetwork.h → src/core/multimaps/tnlEllpackIndexMultimap.h

 /***************************************************************************
-                          tnlEllpackNetwork.h  -  description
+                          tnlEllpackIndexMultimap.h  -  description
                              -------------------
     begin                : Sep 9, 2015
     copyright            : (C) 2015 by Tomas Oberhuber et al.
@@ -15,58 +15,58 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef TNLELLPACKNETWORK_H
-#define	TNLELLPACKNETWORK_H
+#ifndef TNLELLPACKINDEXMULTIMAP_H
+#define	TNLELLPACKINDEXMULTIMAP_H
 
 #include <core/vectors/tnlVector.h>
 
 template< typename Index = int,
           typename Device = tnlHost >
-class tnlEllpackNetworkPorts;
+class tnlEllpackIndexMultimapValues;
 
 template< typename Index = int,
           typename Device = tnlHost >
-class tnlEllpackNetworkConstPorts;
+class tnlEllpackIndexMultimapConstValues;
 
 template< typename Index = int,
           typename Device = tnlHost >
-class tnlEllpackNetwork
+class tnlEllpackIndexMultimap
 {
    public:
       
-      typedef Device                                                DeviceType;
-      typedef Index                                                 IndexType;
-      typedef tnlEllpackNetworkPorts< IndexType, DeviceType >       PortsType;
-      typedef tnlEllpackNetworkConstPorts< IndexType, DeviceType >  ConstPortsType;
-      typedef tnlVector< IndexType, DeviceType, IndexType >         PortsAllocationVectorType;
+      typedef Device                                                       DeviceType;
+      typedef Index                                                        IndexType;
+      typedef tnlEllpackIndexMultimapValues< IndexType, DeviceType >       ValuesAccessorType;
+      typedef tnlEllpackIndexMultimapConstValues< IndexType, DeviceType >  ConstValuesAccessorType;
+      typedef tnlVector< IndexType, DeviceType, IndexType >                ValuesAllocationVectorType;
             
-      tnlEllpackNetwork();
+      tnlEllpackIndexMultimap();
       
       static tnlString getType();
 
       tnlString getTypeVirtual() const;
       
-      void setDimensions( const IndexType inputs,
-                          const IndexType outputs );
+      void setRanges( const IndexType keysRange,
+                      const IndexType valuesRange );
       
-      const IndexType getInputsCount() const;
+      const IndexType getKeysRange() const;
       
-      const IndexType getOutputsCount() const;
+      const IndexType getValuesRange() const;
       
-      void allocatePorts( const PortsAllocationVectorType& portsCount );
+      void allocate( const ValuesAllocationVectorType& portsCount );
       
-      PortsType getPorts( const IndexType& inputIndex );
+      ValuesAccessorType getValues( const IndexType& inputIndex );
       
-      ConstPortsType getPorts( const IndexType& inputIndex ) const;
+      ConstValuesAccessorType getValues( const IndexType& inputIndex ) const;
       
    protected:
       
-      tnlVector< IndexType, DeviceType, IndexType > ports;
+      tnlVector< IndexType, DeviceType, IndexType > values;
       
-      IndexType inputs, outputs, portsMaxCount;
+      IndexType keysRange, valuesRange, valuesMaxCount;
 };
 
-#include <networks/tnlEllpackNetwork_impl.h>
+#include <core/multimaps/tnlEllpackIndexMultimap_impl.h>
 
-#endif	/* TNLELLPACKNETWORK_H */
+#endif	/* TNLELLPACKINDEXMULTIMAP_H */
 

src/networks/tnlEllpackNetworkPorts.h → src/core/multimaps/tnlEllpackIndexMultimapValues.h

 /***************************************************************************
-                          tnlEllpackNetworkPorts.h  -  description
+                          tnlEllpackIndexMultimapValues.h  -  description
                              -------------------
     begin                : Sep 10, 2015
     copyright            : (C) 2015 by Tomas Oberhuber et al.
@@ -15,23 +15,23 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef TNLELLPACKNETWORKPORTS_H
-#define	TNLELLPACKNETWORKPORTS_H
+#ifndef TNLELLPACKINDEXMULTIMAPVALUES_H
+#define	TNLELLPACKINDEXMULTIMAPVALUES_H
 
 #include <ostream>
-#include <networks/tnlEllpackNetwork.h>
+#include <core/multimaps/tnlEllpackIndexMultimap.h>
 
 template< typename Index,
           typename Device >
-class tnlEllpackNetworkPorts
+class tnlEllpackIndexMultimapValues
 {
    public:
       
       typedef Device                                     DeviceType;
       typedef Index                                      IndexType;
-      typedef tnlEllpackNetwork< IndexType, DeviceType > NetworkType;
+      typedef tnlEllpackIndexMultimap< IndexType, DeviceType > NetworkType;
       
-      tnlEllpackNetworkPorts();
+      tnlEllpackIndexMultimapValues();
       
       IndexType getPortsCount() const;
       
@@ -48,7 +48,7 @@ class tnlEllpackNetworkPorts
       
    protected:
       
-      tnlEllpackNetworkPorts( IndexType* ports, 
+      tnlEllpackIndexMultimapValues( IndexType* ports, 
                               const IndexType input,
                               const IndexType portsMaxCount );
       
@@ -56,15 +56,15 @@ class tnlEllpackNetworkPorts
       
       IndexType step, portsMaxCount;
       
-      friend tnlEllpackNetwork< IndexType, DeviceType >;
+      friend tnlEllpackIndexMultimap< IndexType, DeviceType >;
 };
 
 template< typename Index,
           typename Device >
-std::ostream& operator << ( std::ostream& str, const tnlEllpackNetworkPorts< Index, Device>& ports );
+std::ostream& operator << ( std::ostream& str, const tnlEllpackIndexMultimapValues< Index, Device>& ports );
 
-#include <networks/tnlEllpackNetworkPorts_impl.h>
+#include <core/multimaps/tnlEllpackIndexMultimapValues_impl.h>
 
 
-#endif	/* TNLELLPACKNETWORKPORTS_H */
+#endif	/* TNLELLPACKINDEXMULTIMAPVALUES_H */
 

src/networks/tnlEllpackNetworkPorts_impl.h → src/core/multimaps/tnlEllpackIndexMultimapValues_impl.h

 /***************************************************************************
-                          tnlEllpackNetworkPorts_impl.h  -  description
+                          tnlEllpackIndexMultimapValues_impl.h  -  description
                              -------------------
     begin                : Sep 10, 2015
     copyright            : (C) 2015 by Tomas Oberhuber et al.
@@ -15,23 +15,23 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef TNLELLPACKNETWORKPORTS_IMPL_H
-#define TNLELLPACKNETWORKPORTS_IMPL_H
+#ifndef TNLELLPACKINDEXMULTIMAPVALUES_IMPL_H
+#define TNLELLPACKINDEXMULTIMAPVALUES_IMPL_H
 
-#include "tnlEllpackNetworkPorts.h"
+#include "tnlEllpackIndexMultimapValues.h"
 
 
 template< typename Index,
           typename Device >
-tnlEllpackNetworkPorts< Index, Device >::
-tnlEllpackNetworkPorts()
+tnlEllpackIndexMultimapValues< Index, Device >::
+tnlEllpackIndexMultimapValues()
 {
 }
 
 template< typename Index,
           typename Device >
-tnlEllpackNetworkPorts< Index, Device >::
-tnlEllpackNetworkPorts( IndexType* networkPorts, 
+tnlEllpackIndexMultimapValues< Index, Device >::
+tnlEllpackIndexMultimapValues( IndexType* networkPorts, 
                         const IndexType input,
                         const IndexType portsMaxCount )
 {
@@ -42,7 +42,7 @@ tnlEllpackNetworkPorts( IndexType* networkPorts,
 template< typename Index,
           typename Device >
 Index
-tnlEllpackNetworkPorts< Index, Device >::
+tnlEllpackIndexMultimapValues< Index, Device >::
 getPortsCount() const
 {
    return this->portsMaxCount;
@@ -51,7 +51,7 @@ getPortsCount() const
 template< typename Index,
           typename Device >
 void 
-tnlEllpackNetworkPorts< Index, Device >::
+tnlEllpackIndexMultimapValues< Index, Device >::
 setOutput( const IndexType portIndex,
            const IndexType output )
 {
@@ -61,7 +61,7 @@ setOutput( const IndexType portIndex,
 template< typename Index,
           typename Device >
 Index
-tnlEllpackNetworkPorts< Index, Device >::
+tnlEllpackIndexMultimapValues< Index, Device >::
 getOutput( const IndexType portIndex ) const
 {
    return this->ports[ portIndex ];
@@ -70,7 +70,7 @@ getOutput( const IndexType portIndex ) const
 template< typename Index,
           typename Device >
 Index&
-tnlEllpackNetworkPorts< Index, Device >::
+tnlEllpackIndexMultimapValues< Index, Device >::
 operator[]( const IndexType portIndex )
 {
    return this->ports[ portIndex ];
@@ -79,7 +79,7 @@ operator[]( const IndexType portIndex )
 template< typename Index,
           typename Device >
 const Index&
-tnlEllpackNetworkPorts< Index, Device >::
+tnlEllpackIndexMultimapValues< Index, Device >::
 operator[]( const IndexType portIndex ) const
 {
    return this->ports[ portIndex ];
@@ -88,7 +88,7 @@ operator[]( const IndexType portIndex ) const
 template< typename Index,
           typename Device >
 void
-tnlEllpackNetworkPorts< Index, Device >::
+tnlEllpackIndexMultimapValues< Index, Device >::
 print( std::ostream& str ) const
 {
    if( this->getPortsCount() == 0 )
@@ -104,7 +104,7 @@ print( std::ostream& str ) const
 
 template< typename Index,
           typename Device >
-std::ostream& operator << ( std::ostream& str, const tnlEllpackNetworkPorts< Index, Device>& ports )
+std::ostream& operator << ( std::ostream& str, const tnlEllpackIndexMultimapValues< Index, Device>& ports )
 {
    ports.print( str );
    return str;

src/networks/tnlEllpackNetwork_impl.h → src/core/multimaps/tnlEllpackIndexMultimap_impl.h

 /***************************************************************************
-                          tnlEllpackNetwork_impl.h  -  description
+                          tnlEllpackIndexMultimap_impl.h  -  description
                              -------------------
     begin                : Sep 9, 2015
     copyright            : (C) 2015 by Tomas Oberhuber et al.
@@ -15,26 +15,26 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef TNLELLPACKNETWORK_IMPL_H
-#define	TNLELLPACKNETWORK_IMPL_H
+#ifndef TNLELLPACKINDEXMULTIMAP_IMPL_H
+#define	TNLELLPACKINDEXMULTIMAP_IMPL_H
 
-#include <networks/tnlEllpackNetwork.h>
-#include <networks/tnlEllpackNetworkPorts.h>
+#include <core/multimaps/tnlEllpackIndexMultimap.h>
+#include <core/multimaps/tnlEllpackIndexMultimapValues.h>
 
 
 template< typename Index,
           typename Device >
-tnlEllpackNetwork< Index, Device >::
-tnlEllpackNetwork()
-:  inputs( 0 ), outputs( 0 ), portsMaxCount( 0 )
+tnlEllpackIndexMultimap< Index, Device >::
+tnlEllpackIndexMultimap()
+:  keysRange( 0 ), valuesRange( 0 ), valuesMaxCount( 0 )
 {
 }
 
 template< typename Index,
           typename Device >
-tnlString tnlEllpackNetwork< Index, Device > :: getType()
+tnlString tnlEllpackIndexMultimap< Index, Device > :: getType()
 {
-   return tnlString( "tnlEllpackNetwork< ") +
+   return tnlString( "tnlEllpackIndexMultimap< ") +
           Device :: getDeviceType() +
           tnlString( ", " ) +
           tnlString( ::getType< Index >() ) +                    
@@ -43,7 +43,7 @@ tnlString tnlEllpackNetwork< Index, Device > :: getType()
 
 template< typename Index,
           typename Device >
-tnlString tnlEllpackNetwork< Index, Device >::getTypeVirtual() const
+tnlString tnlEllpackIndexMultimap< Index, Device >::getTypeVirtual() const
 {
    return this->getType();
 }
@@ -51,65 +51,65 @@ tnlString tnlEllpackNetwork< Index, Device >::getTypeVirtual() const
 template< typename Index,
           typename Device >
 void 
-tnlEllpackNetwork< Index, Device >::
-setDimensions( const IndexType inputs,
+tnlEllpackIndexMultimap< Index, Device >::
+setRanges( const IndexType inputs,
                const IndexType outputs )
 {
-   this->inputs = inputs;
-   this->outputs = outputs;
+   this->keysRange = inputs;
+   this->valuesRange = outputs;
 }
 
 template< typename Index,
           typename Device >
 const Index
-tnlEllpackNetwork< Index, Device >::
-getInputsCount() const
+tnlEllpackIndexMultimap< Index, Device >::
+getKeysRange() const
 {
-   return this->inputs;
+   return this->keysRange;
 }
 
 template< typename Index,
           typename Device >
 const Index
-tnlEllpackNetwork< Index, Device >::
-getOutputsCount() const
+tnlEllpackIndexMultimap< Index, Device >::
+getValuesRange() const
 {
-   return this->outputs;
+   return this->valuesRange;
 }
 
 template< typename Index,
           typename Device >
 void
-tnlEllpackNetwork< Index, Device >::
-allocatePorts( const PortsAllocationVectorType& portsCount )
+tnlEllpackIndexMultimap< Index, Device >::
+allocate( const ValuesAllocationVectorType& portsCount )
 {
-   tnlAssert( portsCount.getSize() == this->inputs,
+   tnlAssert( portsCount.getSize() == this->keysRange,
               cerr << "portsCount.getSize() =  " << portsCount.getSize()
-                   << "this->inputs = " << this->inputs );
-   this->portsMaxCount = portsCount.max();
+                   << "this->inputs = " << this->keysRange );
+   this->valuesMaxCount = portsCount.max();
    
-   tnlAssert( this->portsMaxCount >= 0 && this->portsMaxCount <= this->outputs, 
-              cerr << "this->portsMaxCount = " << this->portsMaxCount
-                   << " this->outputs = " << this->outputs );
-   this->ports.setSize( this->inputs * this->portsMaxCount );
+   tnlAssert( this->valuesMaxCount >= 0 && this->valuesMaxCount <= this->valuesRange, 
+              cerr << "this->portsMaxCount = " << this->valuesMaxCount
+                   << " this->outputs = " << this->valuesRange );
+   this->values.setSize( this->keysRange * this->valuesMaxCount );
 }
 
 template< typename Index,
           typename Device >
-typename tnlEllpackNetwork< Index, Device >::PortsType 
-tnlEllpackNetwork< Index, Device >::
-getPorts( const IndexType& inputIndex )
+typename tnlEllpackIndexMultimap< Index, Device >::ValuesAccessorType 
+tnlEllpackIndexMultimap< Index, Device >::
+getValues( const IndexType& inputIndex )
 {
-   return PortsType( this->ports.getData(), inputIndex, this->portsMaxCount );
+   return ValuesAccessorType( this->values.getData(), inputIndex, this->valuesMaxCount );
 }
 
 template< typename Index,
           typename Device >
-typename tnlEllpackNetwork< Index, Device >::ConstPortsType
-tnlEllpackNetwork< Index, Device >::
-getPorts( const IndexType& inputIndex ) const
+typename tnlEllpackIndexMultimap< Index, Device >::ConstValuesAccessorType
+tnlEllpackIndexMultimap< Index, Device >::
+getValues( const IndexType& inputIndex ) const
 {
-   return ConstPortsType( this->ports.getData(), inputIndex, this->portsMaxCount );
+   return ConstPortsType( this->values.getData(), inputIndex, this->valuesMaxCount );
 }
 
 #endif	/* TNLELLPACKGRAPH_IMPL_H */

src/mesh/initializer/tnlMeshSuperentityStorageInitializer.h

@@ -105,11 +105,11 @@ class tnlMeshSuperentityStorageInitializerLayer< MeshConfig,
           */
          SuperentityStorageNetwork& superentityStorageNetwork = meshInitializer.template meshSuperentityStorageNetwork< EntityTopology, DimensionsTag >();
          //GlobalIndexType lastEntityIndex( 0 );
-         superentityStorageNetwork.setDimensions(
+         superentityStorageNetwork.setRanges(
             meshInitializer.template meshEntitiesArray< EntityDimensions >().getSize(),
             meshInitializer.template meshEntitiesArray< DimensionsTag >().getSize() );
          lastEntityIndex = 0;
-         typename SuperentityStorageNetwork::PortsAllocationVectorType storageNetworkAllocationVector;
+         typename SuperentityStorageNetwork::ValuesAllocationVectorType storageNetworkAllocationVector;
          storageNetworkAllocationVector.setSize( meshInitializer.template meshEntitiesArray< EntityDimensions >().getSize() );
          storageNetworkAllocationVector.setValue( 0 );
          for( GlobalIndexType i = 0; i < superentityIdsArray.getSize(); i++)
@@ -119,16 +119,16 @@ class tnlMeshSuperentityStorageInitializerLayer< MeshConfig,
             else
                lastEntityIndex++;                           
          }
-         superentityStorageNetwork.allocatePorts( storageNetworkAllocationVector );
+         superentityStorageNetwork.allocate( storageNetworkAllocationVector );
          lastEntityIndex = 0;
          LocalIndexType superentitiesCount( 0 );
-         typename SuperentityStorageNetwork::PortsType superentitiesIndecis = 
-            superentityStorageNetwork.getPorts( lastEntityIndex );
+         typename SuperentityStorageNetwork::ValuesAccessorType superentitiesIndecis = 
+            superentityStorageNetwork.getValues( lastEntityIndex );
          for( GlobalIndexType i = 0; i < superentityIdsArray.getSize(); i++)
          {
             if( indexPairs[ i ].entityIndex != lastEntityIndex )
             {
-               superentitiesIndecis = superentityStorageNetwork.getPorts( ++lastEntityIndex );
+               superentitiesIndecis = superentityStorageNetwork.getValues( ++lastEntityIndex );
                superentitiesCount = 0;
             }
             superentitiesIndecis[ superentitiesCount++ ] =  indexPairs[ i ].superentityIndex;

src/mesh/layers/tnlMeshSuperentityAccessor.h

@@ -18,15 +18,15 @@
 #ifndef TNLMESHSUPERENTITYACCESSOR_H
 #define	TNLMESHSUPERENTITYACCESSOR_H
 
-template< typename NetworkPorts >
+template< typename IndexMultimapValues >
 class tnlMeshSuperentityAccessor
 {
    public:
       
-      typedef typename NetworkPorts::IndexType   GlobalIndexType;
-      typedef typename NetworkPorts::IndexType   LocalIndexType;
+      typedef typename IndexMultimapValues::IndexType   GlobalIndexType;
+      typedef typename IndexMultimapValues::IndexType   LocalIndexType;
       
-      // TODO: Add LocalIndexType to EllpackNetwork
+      // TODO: Add LocalIndexType to EllpackIndexMultimap
            
       LocalIndexType getSupernetitiesCount() const
       {
@@ -61,12 +61,12 @@ class tnlMeshSuperentityAccessor
       
    protected:
       
-      NetworkPorts ports;
+      IndexMultimapValues ports;
       
 };
 
-template< typename NetworkPorts >
-ostream& operator << ( ostream& str, const tnlMeshSuperentityAccessor< NetworkPorts >& superentityAccessor )
+template< typename IndexMultimapValues >
+ostream& operator << ( ostream& str, const tnlMeshSuperentityAccessor< IndexMultimapValues >& superentityAccessor )
 {
    superentityAccessor.print( str );
    return str;

src/mesh/traits/tnlMeshSuperentityTraits.h

@@ -25,7 +25,7 @@
 #include <mesh/config/tnlMeshConfigBase.h>
 #include <mesh/topologies/tnlMeshEntityTopology.h>
 #include <mesh/traits/tnlMeshEntityTraits.h>
-#include <networks/tnlEllpackNetwork.h>
+#include <core/multimaps/tnlEllpackIndexMultimap.h>
 #include <mesh/layers/tnlMeshSuperentityAccessor.h>
 
 template< typename MeshConfig,
@@ -52,8 +52,8 @@ class tnlMeshSuperentityTraits
     */
    typedef tnlArray< GlobalIndexType, tnlHost, LocalIndexType >             StorageArrayType;
    
-   typedef tnlEllpackNetwork< GlobalIndexType, tnlHost >                        StorageNetworkType;
-   typedef tnlMeshSuperentityAccessor< typename StorageNetworkType::PortsType > SuperentityAccessorType;
+   typedef tnlEllpackIndexMultimap< GlobalIndexType, tnlHost >                        StorageNetworkType;
+   typedef tnlMeshSuperentityAccessor< typename StorageNetworkType::ValuesAccessorType > SuperentityAccessorType;
    
    /****
     * Type for passing the superentities indecis by the getSuperentitiesIndices()

tests/unit-tests/CMakeLists.txt

 ADD_SUBDIRECTORY( core )
-ADD_SUBDIRECTORY( networks )
 ADD_SUBDIRECTORY( matrices )
 ADD_SUBDIRECTORY( mesh )
 ADD_SUBDIRECTORY( operators )
@@ -16,7 +15,7 @@ ADD_TEST( core/vectors/tnlVectorOperationsTest${mpiExt}${debugExt} ${EXECUTABLE_
 ADD_TEST( core/vectors/tnlVectorTest${mpiExt}${debugExt} ${EXECUTABLE_OUTPUT_PATH}/tnlVectorTest${mpiExt}${debugExt} )
 ADD_TEST( core/vectors/tnlStaticVectorTest${mpiExt}${debugExt} ${EXECUTABLE_OUTPUT_PATH}/tnlStaticVectorTest${mpiExt}${debugExt} )
 
-ADD_TEST( networks/tnlEllpackNetworkTest{mpiExt}${debugExt} ${EXECUTABLE_OUTPUT_PATH}/tnlEllpackNetworTest${mpiExt}${debugExt} )
+ADD_TEST( core/multimaps/tnlEllpackIndexMultimapTest{mpiExt}${debugExt} ${EXECUTABLE_OUTPUT_PATH}/tnlEllpackIndexMultimapTest${mpiExt}${debugExt} )
 
 ADD_TEST( matrices/tnlDenseMatrixTest${mpiExt}${debugExt} ${EXECUTABLE_OUTPUT_PATH}/tnlDenseMatrixTest${mpiExt}${debugExt} )
 ADD_TEST( matrices/tnlTridiagonalMatrixTest${mpiExt}${debugExt} ${EXECUTABLE_OUTPUT_PATH}/tnlTridiagonalMatrixTest${mpiExt}${debugExt} )

tests/unit-tests/core/CMakeLists.txt

 ADD_SUBDIRECTORY( arrays )
 ADD_SUBDIRECTORY( cuda )
 ADD_SUBDIRECTORY( vectors )
+ADD_SUBDIRECTORY( multimaps )
 
 set( headers tnlFileTester.h
              tnlStringTester.h

tests/unit-tests/core/multimaps/CMakeLists.txt

+set( headers tnlIndexMultimapTester.h )
+
+ADD_EXECUTABLE( tnlEllpackIndexMultimapTest${mpiExt}${debugExt} ${headers} tnlEllpackIndexMultimapTest.cpp )
+TARGET_LINK_LIBRARIES( tnlEllpackIndexMultimapTest${mpiExt}${debugExt} ${CPPUNIT_LIBRARIES}
+                                                              tnl${mpiExt}${debugExt}-0.1 )
\ No newline at end of file

tests/unit-tests/networks/tnlEllpackNetworkTest.cpp → tests/unit-tests/core/multimaps/tnlEllpackIndexMultimapTest.cpp

 /***************************************************************************
-                          tnlEllpackNetworkTest.cpp  -  description
+                          tnlEllpackIndexMultimapTest.cpp  -  description
                              -------------------
     begin                : Sep 10, 2015
     copyright            : (C) 2015 by Tomas Oberhuber
@@ -19,15 +19,15 @@
 #include <core/tnlHost.h>
 #include <cstdlib>
 
-#include <networks/tnlEllpackNetwork.h>
-#include "tnlNetworkTester.h"
-#include "../tnlUnitTestStarter.h"
+#include <core/multimaps/tnlEllpackIndexMultimap.h>
+#include "tnlIndexMultimapTester.h"
+#include "../../tnlUnitTestStarter.h"
 
 int main( int argc, char* argv[] )
 {
 #ifdef HAVE_CPPUNIT
-   if( ! tnlUnitTestStarter :: run< tnlNetworkTester< tnlEllpackNetwork< int, tnlHost > > >() ||
-       ! tnlUnitTestStarter :: run< tnlNetworkTester< tnlEllpackNetwork< long int, tnlHost > > >() 
+   if( ! tnlUnitTestStarter :: run< tnlIndexMultimapTester< tnlEllpackIndexMultimap< int, tnlHost > > >() ||
+       ! tnlUnitTestStarter :: run< tnlIndexMultimapTester< tnlEllpackIndexMultimap< long int, tnlHost > > >() 
        )
      return EXIT_FAILURE;
    return EXIT_SUCCESS;

tests/unit-tests/networks/CMakeLists.txt

-set( headers tnlNetworkTester.h )
-
-ADD_EXECUTABLE( tnlEllpackNetworkTest${mpiExt}${debugExt} ${headers} tnlEllpackNetworkTest.cpp )
-TARGET_LINK_LIBRARIES( tnlEllpackNetworkTest${mpiExt}${debugExt} ${CPPUNIT_LIBRARIES}
-                                                              tnl${mpiExt}${debugExt}-0.1 )
\ No newline at end of file