Skip to content

Commit 3d3300e

Browse files
mathstufmathstuf
committed
iostream: use std:: for {cout,cerr,endl}
VTK has removed the `using` for these symbols.
1 parent 66416c6 commit 3d3300e

File tree

24 files changed

+325
-323
lines changed

24 files changed

+325
-323
lines changed

‎core/base/common/Debug.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Debug::~Debug() {
2525
if((lastObject_) && (ttk::goodbyeMsg_)) {
2626

2727
printMsg(
28-
"Goodbye :)", debug::Priority::PERFORMANCE, debug::LineMode::NEW, cout);
28+
"Goodbye :)", debug::Priority::PERFORMANCE, debug::LineMode::NEW, std::cout);
2929

3030
ttk::goodbyeMsg_ = false;
3131
}
@@ -147,7 +147,7 @@ int Debug::welcomeMsg(ostream &stream) {
147147
int Debug::setDebugLevel(const int &debugLevel) {
148148
debugLevel_ = debugLevel;
149149

150-
welcomeMsg(cout);
150+
welcomeMsg(std::cout);
151151

152152
return 0;
153153
}

‎core/base/contourForests/ContourForests.cpp‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ void ContourForests::stitchTree(const char treetype) {
141141
= make_pair(parallelData_.interfaces[i].getSeed(), false);
142142

143143
if(DEBUG) {
144-
cout << "partition : " << static_cast<unsigned>(i);
145-
cout << " seed is : " << seedPair.first << endl << endl;
144+
std::cout << "partition : " << static_cast<unsigned>(i);
145+
std::cout << " seed is : " << seedPair.first << std::endl << std::endl;
146146
}
147147

148148
// For each superarc crossing the upper boundary :
@@ -169,14 +169,14 @@ void ContourForests::stitchTree(const char treetype) {
169169
MergeTree *otherTree = getTreePart(otherPartition);
170170

171171
if(DEBUG) {
172-
cout << "crossing arc is " << curTree->printArc(arc) << endl;
172+
std::cout << "crossing arc is " << curTree->printArc(arc) << std::endl;
173173
}
174174

175175
if(DEBUG) {
176-
cout << "stitch vertex : " << stitchVertex << endl;
177-
cout << "on partition " << static_cast<unsigned>(otherPartition)
178-
<< endl;
179-
cout << "crossing arc is now " << curTree->printArc(arc) << endl;
176+
std::cout << "stitch vertex : " << stitchVertex << std::endl;
177+
std::cout << "on partition " << static_cast<unsigned>(otherPartition)
178+
<< std::endl;
179+
std::cout << "crossing arc is now " << curTree->printArc(arc) << std::endl;
180180
}
181181

182182
const idNode &curTreeStitchNodeId
@@ -188,7 +188,7 @@ void ContourForests::stitchTree(const char treetype) {
188188
if(DEBUG) {
189189
const idSuperArc &sa
190190
= otherTree->getCorrespondingSuperArcId(stitchVertex);
191-
cout << "other tree arc is : " << otherTree->printArc(sa) << endl;
191+
std::cout << "other tree arc is : " << otherTree->printArc(sa) << std::endl;
192192
}
193193
const auto &arcToHide
194194
= otherTree->reverseInsertNode(curTreeStitchNode, true);
@@ -198,8 +198,8 @@ void ContourForests::stitchTree(const char treetype) {
198198
otherTreeAlreadyHide = true;
199199

200200
if(DEBUG) {
201-
cout << "hide arc in other : " << otherTree->printArc(arcToHide)
202-
<< endl;
201+
std::cout << "hide arc in other : " << otherTree->printArc(arcToHide)
202+
<< std::endl;
203203
}
204204
}
205205

@@ -208,10 +208,10 @@ void ContourForests::stitchTree(const char treetype) {
208208
Node *otherTreeStitchNode = otherTree->getNode(otherTreeStitchNodeId);
209209

210210
if(DEBUG) {
211-
cout << "Stitch nodes : " << endl;
212-
cout << "current : " << curTree->printNode(curTreeStitchNodeId) << endl;
213-
cout << "other : " << otherTree->printNode(otherTreeStitchNodeId)
214-
<< endl;
211+
std::cout << "Stitch nodes : " << std::endl;
212+
std::cout << "current : " << curTree->printNode(curTreeStitchNodeId) << std::endl;
213+
std::cout << "other : " << otherTree->printNode(otherTreeStitchNodeId)
214+
<< std::endl;
215215
}
216216

217217
// Now we can remove all arc above the stitch vertex in the current tree
@@ -225,14 +225,14 @@ void ContourForests::stitchTree(const char treetype) {
225225
// clear its down arcs if it is the stitch node.
226226
if(stitchVertex == seedPair.first) {
227227
if(DEBUG) {
228-
cout << "stitch vertex is seed" << endl;
228+
std::cout << "stitch vertex is seed" << std::endl;
229229
}
230230
// we have'nt clear it yet
231231
if(!seenSeed[otherPartition]) {
232232
seenSeed[otherPartition] = true;
233233
otherTree->removeInternalDownArcs(otherTreeStitchNodeId);
234234
if(DEBUG) {
235-
cout << "clear below stitch vert " << endl;
235+
std::cout << "clear below stitch vert " << std::endl;
236236
}
237237
}
238238
} else if(!otherTreeAlreadyHide && crossing->getDownCT() == i) {
@@ -242,11 +242,11 @@ void ContourForests::stitchTree(const char treetype) {
242242
otherTreeStitchNodeId, currentBelowSeed);
243243

244244
if(DEBUG) {
245-
cout << "hide arc leading to: ";
245+
std::cout << "hide arc leading to: ";
246246
if(arcToHide != nullSuperArc) {
247-
cout << otherTree->printArc(arcToHide) << endl;
247+
std::cout << otherTree->printArc(arcToHide) << std::endl;
248248
} else {
249-
cout << "not found" << endl;
249+
std::cout << "not found" << std::endl;
250250
}
251251
}
252252
}
@@ -275,18 +275,18 @@ void ContourForests::stitchTree(const char treetype) {
275275
if(crossNextInterface) {
276276
otherTree->addCrossingAbove(otherTree->getNumberOfSuperArcs() - 1);
277277
if(DEBUG) {
278-
cout << "new crossing above" << endl;
278+
std::cout << "new crossing above" << std::endl;
279279
}
280280
}
281281

282282
if(DEBUG) {
283-
cout << "arc added :" << endl;
284-
cout << "current : "
285-
<< curTree->printArc(curTree->getNumberOfSuperArcs() - 1) << endl;
286-
cout << "other : "
283+
std::cout << "arc added :" << std::endl;
284+
std::cout << "current : "
285+
<< curTree->printArc(curTree->getNumberOfSuperArcs() - 1) << std::endl;
286+
std::cout << "other : "
287287
<< otherTree->printArc(otherTree->getNumberOfSuperArcs() - 1)
288-
<< endl;
289-
cout << endl << endl;
288+
<< std::endl;
289+
std::cout << std::endl << std::endl;
290290
}
291291

292292
} // for each arc of this curTree
@@ -381,8 +381,8 @@ void ContourForests::unifyTree(const char treetype) {
381381
leavesNodes.emplace(partition, l);
382382

383383
if(DEBUG) {
384-
cout << "will see : partition : " << static_cast<unsigned>(partition);
385-
cout << " leaf node " << currentTree->printNode(l) << endl;
384+
std::cout << "will see : partition : " << static_cast<unsigned>(partition);
385+
std::cout << " leaf node " << currentTree->printNode(l) << std::endl;
386386
}
387387

388388
// seen once
@@ -409,10 +409,10 @@ void ContourForests::unifyTree(const char treetype) {
409409
Node *currentNode = currentTree->getNode(currentNodeId);
410410

411411
if(DEBUG) {
412-
cout << endl;
413-
cout << "process : partition : "
414-
<< static_cast<unsigned>(currentPartition) << endl;
415-
cout << " node " << currentTree->printNode(currentNodeId) << endl;
412+
std::cout << std::endl;
413+
std::cout << "process : partition : "
414+
<< static_cast<unsigned>(currentPartition) << std::endl;
415+
std::cout << " node " << currentTree->printNode(currentNodeId) << std::endl;
416416
}
417417

418418
// create or recover in tmpTree
@@ -433,12 +433,12 @@ void ContourForests::unifyTree(const char treetype) {
433433
SuperArc *upArc = currentTree->getSuperArc(upArcId);
434434

435435
if(DEBUG) {
436-
cout << " process arc " << currentTree->printArc(upArcId) << endl;
436+
std::cout << " process arc " << currentTree->printArc(upArcId) << std::endl;
437437
}
438438

439439
if(!upArc->isVisible()) {
440440
if(DEBUG) {
441-
cout << " - ignore not visible" << endl;
441+
std::cout << " - ignore not visible" << std::endl;
442442
}
443443
continue;
444444
}
@@ -469,14 +469,14 @@ void ContourForests::unifyTree(const char treetype) {
469469
&& currentNode->getNumberOfDownSuperArcs() == 1) {
470470
upArc = currentTree->getSuperArc(currentNode->getUpSuperArcId(0));
471471
if(DEBUG) {
472-
cout << " cross : "
472+
std::cout << " cross : "
473473
<< currentTree->printArc(currentNode->getUpSuperArcId(0));
474-
cout << endl;
474+
std::cout << std::endl;
475475
}
476476
} else {
477477
// no longer regular : stop here
478478
if(DEBUG) {
479-
cout << "stop at " << currentTree->printNode(currentNodeId) << endl;
479+
std::cout << "stop at " << currentTree->printNode(currentNodeId) << std::endl;
480480
}
481481
break;
482482
}
@@ -492,7 +492,7 @@ void ContourForests::unifyTree(const char treetype) {
492492
tmpTree.closeSuperArc(newArcId_tt, closingNode_tt, false, false);
493493

494494
if(DEBUG) {
495-
cout << " Create arc : " << tmpTree.printArc(newArcId_tt) << endl;
495+
std::cout << " Create arc : " << tmpTree.printArc(newArcId_tt) << std::endl;
496496
}
497497

498498
// push current vertex TODO
@@ -511,14 +511,14 @@ void ContourForests::unifyTree(const char treetype) {
511511
if(nbVisit[closingVertex] == downVal) {
512512
leavesNodes.emplace(closingPartition, closingNodeId);
513513
if(DEBUG) {
514-
cout << " push : partition : "
515-
<< static_cast<unsigned>(closingPartition) << endl;
516-
cout << " push : node : " << closingTree->printNode(closingNodeId)
517-
<< endl;
514+
std::cout << " push : partition : "
515+
<< static_cast<unsigned>(closingPartition) << std::endl;
516+
std::cout << " push : node : " << closingTree->printNode(closingNodeId)
517+
<< std::endl;
518518
}
519519
} else if(DEBUG) {
520-
cout << " visit : " << nbVisit[closingVertex] << endl;
521-
cout << " downVal : " << downVal << endl;
520+
std::cout << " visit : " << nbVisit[closingVertex] << std::endl;
521+
std::cout << " downVal : " << downVal << std::endl;
522522
}
523523
} // end for each up arc
524524
} // end while leavesNodes
@@ -547,83 +547,83 @@ void ContourForests::printVectCT() {
547547
int arcCTUp, arcCTDown;
548548

549549
for(idPartition nb = 0; nb < parallelParams_.nbPartitions; ++nb) {
550-
cout << "CT " << nb << endl;
551-
cout << "Nodes" << endl;
550+
std::cout << "CT " << nb << std::endl;
551+
std::cout << "Nodes" << std::endl;
552552

553553
for(const auto &n : parallelData_.trees[nb].getNodes()) {
554554
if(!n.isHidden()) {
555-
cout << "Node " << n.getVertexId();
555+
std::cout << "Node " << n.getVertexId();
556556

557557
if(n.isHidden())
558-
cout << " X ";
558+
std::cout << " X ";
559559

560-
cout << endl;
561-
cout << " arc up : ";
560+
std::cout << std::endl;
561+
std::cout << " arc up : ";
562562

563563
for(idSuperArc i = 0; i < n.getNumberOfUpSuperArcs(); ++i) {
564-
cout << n.getUpSuperArcId(i) << " ";
564+
std::cout << n.getUpSuperArcId(i) << " ";
565565
}
566566

567-
cout << endl << " arc down : ";
567+
std::cout << std::endl << " arc down : ";
568568

569569
for(idSuperArc i = 0; i < n.getNumberOfDownSuperArcs(); ++i) {
570-
cout << n.getDownSuperArcId(i) << " ";
570+
std::cout << n.getDownSuperArcId(i) << " ";
571571
}
572572

573-
cout << endl;
573+
std::cout << std::endl;
574574
}
575575
}
576576

577-
cout << "Arcs" << endl;
577+
std::cout << "Arcs" << std::endl;
578578

579579
for(const auto &sa : parallelData_.trees[nb].getSuperArc()) {
580580
if(!sa.isHidden()) {
581581
arcCTDown = sa.getDownCT();
582582
arcCTUp = sa.getUpCT();
583583

584584
if(sa.getDownNodeId() == nullNodes) {
585-
cout << "||";
585+
std::cout << "||";
586586
} else {
587-
cout << static_cast<unsigned>(arcCTDown) << ":";
588-
cout << parallelData_.trees[arcCTDown]
587+
std::cout << static_cast<unsigned>(arcCTDown) << ":";
588+
std::cout << parallelData_.trees[arcCTDown]
589589
.getNode(sa.getDownNodeId())
590590
->getVertexId();
591591
}
592592

593593
if(sa.isHidden())
594-
cout << " <X> ";
594+
std::cout << " <X> ";
595595
else if(!sa.isVisible())
596-
cout << " <-> ";
596+
std::cout << " <-> ";
597597
else
598-
cout << " <> ";
598+
std::cout << " <> ";
599599

600600
if(sa.getUpNodeId() == nullNodes) {
601-
cout << "||";
601+
std::cout << "||";
602602
} else {
603-
cout << static_cast<unsigned>(arcCTUp) << ":";
604-
cout << parallelData_.trees[arcCTUp]
603+
std::cout << static_cast<unsigned>(arcCTUp) << ":";
604+
std::cout << parallelData_.trees[arcCTUp]
605605
.getNode(sa.getUpNodeId())
606606
->getVertexId();
607607
}
608608

609-
cout << endl;
609+
std::cout << std::endl;
610610
}
611611
}
612612

613613
if(true) {
614-
cout << "Leaves" << endl;
614+
std::cout << "Leaves" << std::endl;
615615

616616
for(const auto &l : parallelData_.trees[nb].getLeaves())
617-
cout << " " << l;
617+
std::cout << " " << l;
618618

619-
cout << endl;
619+
std::cout << std::endl;
620620

621-
cout << "Roots" << endl;
621+
std::cout << "Roots" << std::endl;
622622

623623
for(const auto &r : parallelData_.trees[nb].getRoots())
624-
cout << " " << r;
624+
std::cout << " " << r;
625625

626-
cout << endl;
626+
std::cout << std::endl;
627627
}
628628
}
629629
}

‎core/base/contourForests/ContourForestsTemplate.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -653,19 +653,19 @@ namespace ttk {
653653
// {
654654

655655
// for (idInterface i = 0; i < parallelParams_.nbInterfaces; i++) {
656-
// cout << "interface : " << i << endl;
656+
// std::cout << "interface : " << i << std::endl;
657657

658-
// cout << "upper" << endl;
658+
// std::cout << "upper" << std::endl;
659659
// for (const SimplexId &v : parallelData_.interfaces[i].getUpper()) {
660-
// cout << v << ", ";
660+
// std::cout << v << ", ";
661661
//}
662662

663-
// cout << endl << "lower" << endl;
663+
// std::cout << std::endl << "lower" << std::endl;
664664
// for (const SimplexId &v : parallelData_.interfaces[i].getLower()) {
665-
// cout << v << ", ";
665+
// std::cout << v << ", ";
666666
//}
667667

668-
// cout << endl;
668+
// std::cout << std::endl;
669669
//}
670670

671671
// }

0 commit comments

Comments
 (0)