Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ struct DenseNodeData< Data , UIntPack< FEMSigs ... > > : public _SparseOrDenseNo
Data& operator[]( const RegularTreeNode< Dim , FEMTreeNodeData >* node ) { return _data[ node->nodeData.nodeIndex ]; }
Data* operator()( const RegularTreeNode< Dim , FEMTreeNodeData >* node ) { return ( node==NULL || node->nodeData.nodeIndex>=(int)_sz ) ? NULL : &_data[ node->nodeData.nodeIndex ]; }
const Data* operator()( const RegularTreeNode< Dim , FEMTreeNodeData >* node ) const { return ( node==NULL || node->nodeData.nodeIndex>=(int)_sz ) ? NULL : &_data[ node->nodeData.nodeIndex ]; }
int index( const RegularTreeNode< Dim , FEMTreeNodeData >* node ) const { return ( !node || node->nodeData.nodeIndex<0 || node->nodeData.nodeIndex>=(int)this->_data.size() ) ? -1 : node->nodeData.nodeIndex; }
int index( const RegularTreeNode< Dim , FEMTreeNodeData >* node ) const { return ( !node || node->nodeData.nodeIndex<0 || node->nodeData.nodeIndex>=(int)this->_data->size() ) ? -1 : node->nodeData.nodeIndex; }
Pointer( Data ) operator()( void ) { return _data; }
ConstPointer( Data ) operator()( void ) const { return ( ConstPointer( Data ) )_data; }
protected:
Expand Down Expand Up @@ -1923,12 +1923,12 @@ class FEMTree
if( node )
{
int d , off[Dim] ; node->depthAndOffset( d , off );
BaseFEMIntegrator::template ParentOverlapBounds( UIntPack< FEMDegrees1 ... >() , UIntPack< FEMDegrees2 ... >() , d , off , start , end );
BaseFEMIntegrator::template ParentOverlapBounds<>( UIntPack< FEMDegrees1 ... >() , UIntPack< FEMDegrees2 ... >() , d , off , start , end );
}
}
template< unsigned int ... FEMDegrees1 , unsigned int ... FEMDegrees2 > static void _SetParentOverlapBounds( UIntPack< FEMDegrees1 ... > , UIntPack< FEMDegrees2 ... > , int cIdx , int start[Dim] , int end[Dim] )
{
BaseFEMIntegrator::template ParentOverlapBounds( UIntPack< FEMDegrees1 ... >() , UIntPack< FEMDegrees2 ... >() , cIdx , start , end );
BaseFEMIntegrator::template ParentOverlapBounds<>( UIntPack< FEMDegrees1 ... >() , UIntPack< FEMDegrees2 ... >() , cIdx , start , end );
}

template< unsigned int ... FEMSigs >
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ namespace HyperCube
{
unsigned int coIndex;
e.factor( dir , coIndex );
if( dir==CROSS ) Cube< D-1 >::template _FactorOrientation( typename Cube< D-1 >::template Element< D-2 >( coIndex ) , dim , dir );
if( dir==CROSS ) Cube< D-1 >::template _FactorOrientation<>( typename Cube< D-1 >::template Element< D-2 >( coIndex ) , dim , dir );
else dim = D-1;
}
template< unsigned int D > template< unsigned int _D >
Expand Down Expand Up @@ -660,9 +660,9 @@ namespace HyperCube
{
Direction eDir , dDir ; unsigned int eCoIndex , dCoIndex;
e.factor( eDir , eCoIndex ) , d.factor( dDir , dCoIndex );
if ( eDir==CROSS ){ return 1 + Cube< D-1 >::template CellOffset( typename Cube< D-1 >::template Element< K-1 >( eCoIndex ) , d ) * 3; }
else if( eDir==BACK ){ return 0 + ( dDir==BACK ? 0 : 1 ) + Cube< D-1 >::template CellOffset( typename Cube< D-1 >::template Element< K >( eCoIndex ) , typename Cube< D-1 >::template IncidentCubeIndex< K >( dCoIndex ) ) * 3; }
else if( eDir==FRONT ){ return 1 + ( dDir==BACK ? 0 : 1 ) + Cube< D-1 >::template CellOffset( typename Cube< D-1 >::template Element< K >( eCoIndex ) , typename Cube< D-1 >::template IncidentCubeIndex< K >( dCoIndex ) ) * 3; }
if ( eDir==CROSS ){ return 1 + Cube< D-1 >::template CellOffset<>( typename Cube< D-1 >::template Element< K-1 >( eCoIndex ) , d ) * 3; }
else if( eDir==BACK ){ return 0 + ( dDir==BACK ? 0 : 1 ) + Cube< D-1 >::template CellOffset<>( typename Cube< D-1 >::template Element< K >( eCoIndex ) , typename Cube< D-1 >::template IncidentCubeIndex< K >( dCoIndex ) ) * 3; }
else if( eDir==FRONT ){ return 1 + ( dDir==BACK ? 0 : 1 ) + Cube< D-1 >::template CellOffset<>( typename Cube< D-1 >::template Element< K >( eCoIndex ) , typename Cube< D-1 >::template IncidentCubeIndex< K >( dCoIndex ) ) * 3; }
return 0;
}
template< unsigned int D > template< unsigned int K , unsigned int _D >
Expand Down Expand Up @@ -693,9 +693,9 @@ namespace HyperCube
{
Direction eDir , dDir ; unsigned int eCoIndex , dCoIndex;
e.factor( eDir , eCoIndex ) , d.factor( dDir , dCoIndex );
if ( eDir==CROSS ) return Element< K >( eDir , Cube< D-1 >::template IncidentElement( typename Cube< D-1 >::template Element< K-1 >( eCoIndex ) , d ).index );
else if( eDir==dDir ) return Element< K >( Opposite( eDir ) , Cube< D-1 >::template IncidentElement( typename Cube< D-1 >::template Element< K >( eCoIndex ) , typename Cube< D-1 >::template IncidentCubeIndex< K >( dCoIndex ) ).index );
else return Element< K >( eDir , Cube< D-1 >::template IncidentElement( typename Cube< D-1 >::template Element< K >( eCoIndex ) , typename Cube< D-1 >::template IncidentCubeIndex< K >( dCoIndex ) ).index );
if ( eDir==CROSS ) return Element< K >( eDir , Cube< D-1 >::template IncidentElement<>( typename Cube< D-1 >::template Element< K-1 >( eCoIndex ) , d ).index );
else if( eDir==dDir ) return Element< K >( Opposite( eDir ) , Cube< D-1 >::template IncidentElement<>( typename Cube< D-1 >::template Element< K >( eCoIndex ) , typename Cube< D-1 >::template IncidentCubeIndex< K >( dCoIndex ) ).index );
else return Element< K >( eDir , Cube< D-1 >::template IncidentElement<>( typename Cube< D-1 >::template Element< K >( eCoIndex ) , typename Cube< D-1 >::template IncidentCubeIndex< K >( dCoIndex ) ).index );
}
template< unsigned int D > template< unsigned int K , unsigned int _D >
#ifdef _MSC_VER
Expand All @@ -706,8 +706,8 @@ namespace HyperCube
{
Direction eDir , dDir ; unsigned int eCoIndex , dCoIndex;
e.factor( eDir , eCoIndex ) , d.factor( dDir , dCoIndex );
if( eDir==dDir ) return Element< K >( Opposite( eDir ) , Cube< D-1 >::template IncidentElement( typename Cube< D-1 >::template Element< K >( eCoIndex ) , typename Cube< D-1 >::template IncidentCubeIndex< K >( dCoIndex ) ).index );
else return Element< K >( eDir , Cube< D-1 >::template IncidentElement( typename Cube< D-1 >::template Element< K >( eCoIndex ) , typename Cube< D-1 >::template IncidentCubeIndex< K >( dCoIndex ) ).index );
if( eDir==dDir ) return Element< K >( Opposite( eDir ) , Cube< D-1 >::template IncidentElement<>( typename Cube< D-1 >::template Element< K >( eCoIndex ) , typename Cube< D-1 >::template IncidentCubeIndex< K >( dCoIndex ) ).index );
else return Element< K >( eDir , Cube< D-1 >::template IncidentElement<>( typename Cube< D-1 >::template Element< K >( eCoIndex ) , typename Cube< D-1 >::template IncidentCubeIndex< K >( dCoIndex ) ).index );
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ SparseMatrix< T , IndexType , 0 > SparseMatrix< T , IndexType , 0 >::Transpose(
A.resize( aRows );
for( size_t i=0 ; i<aRows ; i++ ) A.rowSizes[i] = 0;
for( size_t i=0 ; i<At.rows() ; i++ ) for( const_iterator iter=At.begin(i) ; iter!=At.end(i) ; iter++ ) A.rowSizes[ iter->N ]++;
for( size_t i=0 ; i<A.rows ; i++ )
for( size_t i=0 ; i<A.rows() ; i++ )
{
size_t t = A.rowSizes[i];
A.rowSizes[i] = 0;
Expand Down Expand Up @@ -495,7 +495,7 @@ SparseMatrix< T , IndexType , 0 > SparseMatrix< T , IndexType , 0 >::Transpose(
A.resize( aRows );
for( size_t i=0 ; i<aRows ; i++ ) A.rowSizes[i] = 0;
for( size_t i=0 ; i<At.rows() ; i++ ) for( const_iterator iter=At.begin(i) ; iter!=At.end(i) ; iter++ ) A.rowSizes[ iter->N ]++;
for( size_t i=0 ; i<A.rows ; i++ )
for( size_t i=0 ; i<A.rows() ; i++ )
{
size_t t = A.rowSizes[i];
A.rowSizes[i] = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#import <Foundation/Foundation.h>
#import <SceneKit/SceneKit.h>
#import <standard_cyborg/sc3d/Line.hpp>
#include <vector>

using namespace standard_cyborg;

Expand Down