Commit d5129085 authored by Mathias Goldau's avatar Mathias Goldau
Browse files

[CLEAN] removed unnecessarry constructor prefixes of boost shared_ptr

parent 07c10bdd
......@@ -92,7 +92,7 @@ boost::shared_ptr< WPrototyped > WFiberCluster::getPrototype()
void WFiberCluster::generateCenterLine()
{
// make copies of the fibers
boost::shared_ptr< WDataSetFiberVector > fibs = boost::shared_ptr< WDataSetFiberVector >( new WDataSetFiberVector() );
boost::shared_ptr< WDataSetFiberVector > fibs( new WDataSetFiberVector() );
size_t avgFiberSize = 0;
for( std::list< size_t >::const_iterator cit = m_memberIndices.begin(); cit != m_memberIndices.end(); ++cit )
{
......
......@@ -99,8 +99,7 @@ void WJoinContourTree::buildJoinTree()
boost::shared_ptr< std::set< size_t > > WJoinContourTree::getVolumeVoxelsEnclosedByISOSurface( const double isoValue ) const
{
using boost::shared_ptr;
shared_ptr< std::vector< size_t > > result = shared_ptr< std::vector< size_t > >( new std::vector< size_t >( m_elementIndices ) );
boost::shared_ptr< std::vector< size_t > > result( new std::vector< size_t >( m_elementIndices ) );
WUnionFind uf( m_elementIndices.size() );
// assume the m_elementIndices array is still sorted descending on its iso values in the valueset
......
......@@ -107,7 +107,7 @@ public:
{
WDataSetFiberVector expected( *m_cluster->getDataSetReference() ); // make a copy
boost::shared_ptr< WDataSetFiberVector > fibs = boost::shared_ptr< WDataSetFiberVector >( new WDataSetFiberVector( expected ) );
boost::shared_ptr< WDataSetFiberVector > fibs( new WDataSetFiberVector( expected ) );
fibs->at( 1 ).reverseOrder(); // simulate wrong direction of the second fiber
m_cluster->unifyDirection( fibs );
......@@ -143,7 +143,7 @@ public:
expected.push_back( a );
expected.push_back( b );
boost::shared_ptr< WDataSetFiberVector > ds = boost::shared_ptr< WDataSetFiberVector >( new WDataSetFiberVector( expected ) );
boost::shared_ptr< WDataSetFiberVector > ds( new WDataSetFiberVector( expected ) );
ds->at( 1 ).reverseOrder();
m_cluster->unifyDirection( ds );
TS_ASSERT_EQUALS( *ds, expected ); // second tract should flip over
......@@ -190,7 +190,7 @@ public:
expected.push_back( a );
expected.push_back( b );
boost::shared_ptr< WDataSetFiberVector > ds = boost::shared_ptr< WDataSetFiberVector >( new WDataSetFiberVector( expected ) );
boost::shared_ptr< WDataSetFiberVector > ds( new WDataSetFiberVector( expected ) );
ds->at( 1 ).reverseOrder();
m_cluster->unifyDirection( ds );
TS_ASSERT_EQUALS( *ds, expected ); // second tract should flip over
......@@ -239,7 +239,7 @@ public:
expected.push_back( a );
expected.push_back( b );
boost::shared_ptr< WDataSetFiberVector > ds = boost::shared_ptr< WDataSetFiberVector >( new WDataSetFiberVector( expected ) );
boost::shared_ptr< WDataSetFiberVector > ds( new WDataSetFiberVector( expected ) );
ds->at( 1 ).reverseOrder();
m_cluster->unifyDirection( ds );
TS_ASSERT_EQUALS( *ds, expected ); // second tract should flip over
......@@ -295,7 +295,7 @@ public:
expected.push_back( a );
expected.push_back( b );
boost::shared_ptr< WDataSetFiberVector > ds = boost::shared_ptr< WDataSetFiberVector >( new WDataSetFiberVector( expected ) );
boost::shared_ptr< WDataSetFiberVector > ds( new WDataSetFiberVector( expected ) );
ds->at( 1 ).reverseOrder();
m_cluster->unifyDirection( ds );
TS_ASSERT_EQUALS( *ds, expected ); // second tract should flip over
......@@ -342,7 +342,7 @@ public:
expected.push_back( a );
expected.push_back( b );
boost::shared_ptr< WDataSetFiberVector > ds = boost::shared_ptr< WDataSetFiberVector >( new WDataSetFiberVector( expected ) );
boost::shared_ptr< WDataSetFiberVector > ds( new WDataSetFiberVector( expected ) );
ds->at( 1 ).reverseOrder();
m_cluster->unifyDirection( ds );
TS_ASSERT_EQUALS( *ds, expected ); // second tract should flip over
......@@ -414,7 +414,7 @@ private:
fib_b.push_back( wmath::WPosition( 0, 2, 0 ) );
fib_b.push_back( wmath::WPosition( 2, 2, 0 ) );
fib_b.push_back( wmath::WPosition( 4, 2, 0 ) );
boost::shared_ptr< WDataSetFiberVector > ds = boost::shared_ptr< WDataSetFiberVector >( new WDataSetFiberVector() );
boost::shared_ptr< WDataSetFiberVector > ds( new WDataSetFiberVector() );
ds->push_back( fib_a );
ds->push_back( fib_b );
generateFiberCluster( ds );
......
......@@ -130,11 +130,10 @@ protected:
// |___ |___ |____| |___ |___ |____|
// 15 11 -1 -3 0 1 2 3
boost::shared_ptr< WGridRegular3D > grid = boost::shared_ptr< WGridRegular3D >( new WGridRegular3D( 4, 4, 1, 1, 1, 1 ) );
boost::shared_ptr< WGridRegular3D > grid( new WGridRegular3D( 4, 4, 1, 1, 1, 1 ) );
double isoValuesData[] = { 15, 11, -1, -3, 13, 12, 1, 0, 3, 5, 10, 9, 2, 4, 8, 14 }; // NOLINT
std::vector< double > isoValues( isoValuesData, isoValuesData + 16 );
boost::shared_ptr< WValueSet< double > > valueset;
valueset = boost::shared_ptr< WValueSet< double > >( new WValueSet< double >( 0, 1, isoValues, W_DT_DOUBLE ) );
boost::shared_ptr< WValueSet< double > > valueset( new WValueSet< double >( 0, 1, isoValues, W_DT_DOUBLE ) );
m_dataset = boost::shared_ptr< WDataSetSingle >( new WDataSetSingle( valueset, grid ) );
}
......
......@@ -93,7 +93,7 @@ void WMContourTree::moduleMain()
continue;
}
boost::shared_ptr< WJoinContourTree > joinTree = boost::shared_ptr< WJoinContourTree >( new WJoinContourTree( m_input->getData() ) );
boost::shared_ptr< WJoinContourTree > joinTree( new WJoinContourTree( m_input->getData() ) );
joinTree->buildJoinTree();
m_output->updateData( joinTree );
}
......
......@@ -195,16 +195,6 @@ void WMFiberClustering::update()
updateOutput();
}
boost::shared_ptr< WDataSetSingle > WMFiberClustering::blurClusters() const
{
boost::shared_ptr< WValueSet< double > > valueSet;
boost::shared_ptr< WGridRegular3D > grid;
std::vector< double > data;
valueSet = boost::shared_ptr< WValueSet< double > >( new WValueSet< double >( 0, 3, data, W_DT_DOUBLE ) );
grid = boost::shared_ptr< WGridRegular3D >( new WGridRegular3D( 100, 100, 100, 0.5, 0.5, 0.5 ) );
return boost::shared_ptr< WDataSetSingle >( new WDataSetSingle( valueSet, grid ) );
}
bool WMFiberClustering::dLtTableExists()
{
std::string dLtFileName = lookUpTableFileName();
......@@ -217,9 +207,7 @@ bool WMFiberClustering::dLtTableExists()
debugLog() << "trying to read table from: " << dLtFileName;
// TODO(math): replace this hard coded path when properties are available
WReaderLookUpTableVTK r( dLtFileName );
using boost::shared_ptr;
using std::vector;
shared_ptr< vector< double > > data = shared_ptr< vector < double > >( new vector< double >() );
boost::shared_ptr< std::vector< double > > data( new std::vector< double >() );
r.readTable( data );
m_dLtTable.reset( new WDXtLookUpTable( static_cast< size_t >( data->back() ) ) );
m_lastFibsSize = static_cast< size_t >( data->back() );
......@@ -257,7 +245,7 @@ void WMFiberClustering::cluster()
m_clusterIDs[i] = i;
}
boost::shared_ptr< WProgress > progress = boost::shared_ptr< WProgress >( new WProgress( "Fiber clustering", numFibers ) );
boost::shared_ptr< WProgress > progress( new WProgress( "Fiber clustering", numFibers ) );
m_progress->addSubProgress( progress );
boost::function< double ( const wmath::WFiber& q, const wmath::WFiber& r ) > dLt; // NOLINT
......@@ -393,12 +381,11 @@ void WMFiberClustering::meld( size_t qClusterID, size_t rClusterID )
void WMFiberClustering::connectors()
{
using boost::shared_ptr;
typedef WModuleInputData< WDataSetFibers > InputData; // just an alias
typedef WModuleOutputData< WFiberCluster > OutputData; // -"-
m_fiberInput = shared_ptr< InputData >( new InputData( shared_from_this(), "fiberInput", "A loaded fiber dataset." ) );
m_output = shared_ptr< OutputData >( new OutputData( shared_from_this(), "clusterOutput", "One Cluster" ) );
m_fiberInput = boost::shared_ptr< InputData >( new InputData( shared_from_this(), "fiberInput", "A loaded fiber dataset." ) );
m_output = boost::shared_ptr< OutputData >( new OutputData( shared_from_this(), "clusterOutput", "One Cluster" ) );
addConnector( m_fiberInput );
addConnector( m_output );
......
......@@ -160,13 +160,6 @@ private:
*/
std::string lookUpTableFileName() const;
/**
* For each cluster a dataset is generated in which its fibers are blurred.
*
* \return Datasets containing the blurred clusters.
*/
boost::shared_ptr< WDataSetSingle > blurClusters() const;
/**
* Updates the output with new cluster.
*/
......
......@@ -107,12 +107,11 @@ void WMFiberCulling::update()
void WMFiberCulling::connectors()
{
using boost::shared_ptr;
typedef WModuleInputData< WDataSetFibers > FiberInputData; // just an alias
m_fiberInput = shared_ptr< FiberInputData >( new FiberInputData( shared_from_this(), "fiberInput", "A loaded fiber dataset." ) );
m_fiberInput = boost::shared_ptr< FiberInputData >( new FiberInputData( shared_from_this(), "fiberInput", "A loaded fiber dataset." ) );
typedef WModuleOutputData< WDataSetFibers > FiberOutputData; // just an alias
m_output = shared_ptr< FiberOutputData >( new FiberOutputData( shared_from_this(), "fiberOutput", "The fibers that survied culling." ) );
m_output = boost::shared_ptr< FiberOutputData >( new FiberOutputData( shared_from_this(), "fiberOutput", "The fibers that survied culling." ) );
addConnector( m_fiberInput );
addConnector( m_output );
......@@ -150,7 +149,7 @@ void WMFiberCulling::cullOutFibers()
const double proxSquare = proximity_t * proximity_t;
dSt = boost::bind( wmath::WFiber::distDST, proxSquare, _1, _2 );
boost::shared_ptr< WProgress > progress = boost::shared_ptr< WProgress >( new WProgress( "Fiber culling", numFibers ) );
boost::shared_ptr< WProgress > progress( new WProgress( "Fiber culling", numFibers ) );
m_progress->addSubProgress( progress );
for( size_t q = 0; q < numFibers; ++q ) // loop over all streamlines
......
......@@ -178,8 +178,6 @@ osg::ref_ptr< osg::Geode > WMVoxelizer::genFiberGeode() const
boost::shared_ptr< WGridRegular3D > WMVoxelizer::constructGrid( const std::pair< wmath::WPosition, wmath::WPosition >& bb ) const
{
boost::shared_ptr< WGridRegular3D > grid;
int32_t nbVoxelsPerUnit = m_voxelsPerUnit->get( true );
// TODO(math): implement the snap-to-grid (of the T1 image) feature for fll and bur.
......@@ -190,8 +188,10 @@ boost::shared_ptr< WGridRegular3D > WMVoxelizer::constructGrid( const std::pair<
size_t nbPosY = std::ceil( bb.second[1] - bb.first[1] ) + 1;
size_t nbPosZ = std::ceil( bb.second[2] - bb.first[2] ) + 1;
grid = boost::shared_ptr< WGridRegular3D >( new WGridRegular3D( nbVoxelsPerUnit * nbPosX, nbVoxelsPerUnit * nbPosY, nbVoxelsPerUnit * nbPosZ,
bb.first, 1, 1, 1 ) );
boost::shared_ptr< WGridRegular3D > grid( new WGridRegular3D( nbVoxelsPerUnit * nbPosX,
nbVoxelsPerUnit * nbPosY,
nbVoxelsPerUnit * nbPosZ,
bb.first, 1, 1, 1 ) );
return grid;
}
......@@ -314,19 +314,15 @@ void WMVoxelizer::raster( boost::shared_ptr< WRasterAlgorithm > algo ) const
void WMVoxelizer::connectors()
{
using boost::shared_ptr;
typedef WModuleInputData< const WFiberCluster > InputConnectorType; // just an alias
m_input = shared_ptr< InputConnectorType >( new InputConnectorType( shared_from_this(), "voxelInput", "A loaded dataset with grid." ) );
typedef WModuleInputData< const WFiberCluster > InputType; // just an alias
m_input = boost::shared_ptr< InputType >( new InputType( shared_from_this(), "voxelInput", "A loaded dataset with grid." ) );
addConnector( m_input );
typedef WModuleOutputData< WDataSetSingle > OutputConnectorType; // just an alias
m_output = shared_ptr< OutputConnectorType >( new OutputConnectorType( shared_from_this(), "voxelOutput", "The voxelized data set." ) );
typedef WModuleOutputData< WDataSetSingle > OutputType; // just an alias
m_output = boost::shared_ptr< OutputType >( new OutputType( shared_from_this(), "voxelOutput", "The voxelized data set." ) );
addConnector( m_output );
m_dirOutput = shared_ptr< OutputConnectorType >( new OutputConnectorType( shared_from_this(), "voxelDirectionOutput",
"The voxelized direction data set." )
);
m_dirOutput = boost::shared_ptr< OutputType >( new OutputType( shared_from_this(), "voxelDirectionOutput", "The voxelized direction dataset." ) );
addConnector( m_dirOutput );
WModule::connectors(); // call WModules initialization
......
......@@ -47,19 +47,13 @@ WRasterAlgorithm::~WRasterAlgorithm()
boost::shared_ptr< WDataSetSingle > WRasterAlgorithm::generateDataSet() const
{
boost::shared_ptr< WDataSetSingle > result;
boost::shared_ptr< WValueSet< double > > valueSet;
valueSet = boost::shared_ptr< WValueSet< double > >( new WValueSet< double >( 0, 1, m_values, W_DT_DOUBLE ) );
result = boost::shared_ptr< WDataSetSingle >( new WDataSetSingle( valueSet, m_grid ) );
return result;
boost::shared_ptr< WValueSet< double > > valueSet( new WValueSet< double >( 0, 1, m_values, W_DT_DOUBLE ) );
return boost::shared_ptr< WDataSetSingle >( new WDataSetSingle( valueSet, m_grid ) );
}
boost::shared_ptr< WDataSetSingle > WRasterAlgorithm::generateVectorDataSet() const
{
boost::shared_ptr< WDataSetSingle > result;
boost::shared_ptr< WValueSet< double > > valueSet;
valueSet = boost::shared_ptr< WValueSet< double > >( new WValueSet< double >( 1, 3, m_dirValues, W_DT_DOUBLE ) );
result = boost::shared_ptr< WDataSetSingle >( new WDataSetSingle( valueSet, m_grid ) );
return result;
boost::shared_ptr< WValueSet< double > > valueSet( new WValueSet< double >( 1, 3, m_dirValues, W_DT_DOUBLE ) );
return boost::shared_ptr< WDataSetSingle >( new WDataSetSingle( valueSet, m_grid ) );
}
......@@ -46,8 +46,7 @@ public:
*/
void setUp( void )
{
boost::shared_ptr< WGridRegular3D > grid;
grid = boost::shared_ptr< WGridRegular3D >( new WGridRegular3D( 3, 3, 3, 0, 0, 0, 1, 1, 1 ) );
boost::shared_ptr< WGridRegular3D > grid( new WGridRegular3D( 3, 3, 3, 0, 0, 0, 1, 1, 1 ) );
m_algo = boost::shared_ptr< WBresenhamDBL >( new WBresenhamDBL( grid, false ) );
}
......@@ -115,8 +114,7 @@ public:
// */
// void testRasteringIn3rdQuadrant( void )
// {
// boost::shared_ptr< WGridRegular3D > grid;
// grid = boost::shared_ptr< WGridRegular3D >( new WGridRegular3D( 3, 3, 3, -2, -2, -2, 1, 1, 1 ) );
// boost::shared_ptr< WGridRegular3D > grid( new WGridRegular3D( 3, 3, 3, -2, -2, -2, 1, 1, 1 ) );
// m_algo = boost::shared_ptr< WBresenhamDBL >( new WBresenhamDBL( grid, false ) );
//
// wmath::WLine l;
......
......@@ -46,8 +46,7 @@ public:
*/
void setUp( void )
{
boost::shared_ptr< WGridRegular3D > grid;
grid = boost::shared_ptr< WGridRegular3D >( new WGridRegular3D( 3, 3, 3, 0, 0, 0, 1, 1, 1 ) );
boost::shared_ptr< WGridRegular3D > grid( new WGridRegular3D( 3, 3, 3, 0, 0, 0, 1, 1, 1 ) );
m_algo = boost::shared_ptr< WBresenham >( new WBresenham( grid, false ) );
}
......@@ -112,8 +111,7 @@ public:
*/
void testRasteringIn3rdQuadrant( void )
{
boost::shared_ptr< WGridRegular3D > grid;
grid = boost::shared_ptr< WGridRegular3D >( new WGridRegular3D( 3, 3, 3, -2, -2, -2, 1, 1, 1 ) );
boost::shared_ptr< WGridRegular3D > grid( new WGridRegular3D( 3, 3, 3, -2, -2, -2, 1, 1, 1 ) );
m_algo = boost::shared_ptr< WBresenham >( new WBresenham( grid, false ) );
wmath::WLine l;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment