Skip to content

Commit

Permalink
code formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
MohamedKISSI committed Jul 2, 2024
1 parent efb02dd commit 9e178cf
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 17 deletions.
18 changes: 12 additions & 6 deletions core/base/common/welcomeMsg.inl
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,37 @@ printMsg(
debug::LineMode::NEW,
stream);
printMsg(debug::output::BOLD
//+ "|_ _|_ _| |/ / / /__\\ \\ |___ \\ / _ " "\\___ \\|___ /"
+ "|_ _|_ _| |/ / / /__\\ \\ |___ \\ / _ \\___ \\| || |"
//+ "|_ _|_ _| |/ / / /__\\ \\ |___ \\ / _ "
//"\\___ \\|___ /"
+ "|_ _|_ _| |/ / / /__\\ \\ |___ \\ / _ "
"\\___ \\| || |"
+ debug::output::ENDCOLOR,
debug::Priority::PERFORMANCE,
debug::LineMode::NEW,
stream);
printMsg(
debug::output::BOLD
//+ " | | | | | ' / | |/ __| | __) | | | |__) | |_ \\"
//+ " | | | | | ' / | |/ __| | __) | | | |__) | |_
//\\"
+ " | | | | | ' / | |/ __| | __) | | | |__) | || |_"
+ debug::output::ENDCOLOR,
debug::Priority::PERFORMANCE,
debug::LineMode::NEW,
stream);
printMsg(
debug::output::BOLD
// + " | | | | | . \\ | | (__| | / __/| |_| / __/ ___) |"
// + " | | | | | . \\ | | (__| | / __/| |_| / __/
// ___) |"
+ " | | | | | . \\ | | (__| | / __/| |_| / __/|__ _|"
+ debug::output::ENDCOLOR,
debug::Priority::PERFORMANCE,
debug::LineMode::NEW,
stream);
printMsg(debug::output::BOLD
// + " |_| |_| |_|\\_\\ | |\\___| | " "|_____|\\___/_____|____/"
+ " |_| |_| |_|\\_\\ | |\\___| | |_____|\\___/_____| |_|"
// + " |_| |_| |_|\\_\\ | |\\___| | "
// "|_____|\\___/_____|____/"
+ " |_| |_| |_|\\_\\ | |\\___| | "
"|_____|\\___/_____| |_|"
+ debug::output::ENDCOLOR,
debug::Priority::PERFORMANCE,
debug::LineMode::NEW,
Expand Down
4 changes: 2 additions & 2 deletions core/base/discreteGradient/DiscreteGradient.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ triangulation.
*/
template <typename triangulationType>
int buildGradient(const triangulationType &triangulation,
bool bypassCache = false,
bool bypassCache = false,
const std::vector<bool> *updateMask = nullptr);

/**
Expand Down Expand Up @@ -431,7 +431,7 @@ in the gradient.
const triangulationType &triangulation,
const std::vector<bool> *updateMask
= nullptr) const;

/**
* @brief Return the number of unpaired faces of a given cell in
* a lower star
Expand Down
3 changes: 1 addition & 2 deletions core/base/discreteGradient/DiscreteGradient_Template.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ dataType DiscreteGradient::getPersistence(

template <typename triangulationType>
int DiscreteGradient::buildGradient(const triangulationType &triangulation,
bool bypassCache,
bool bypassCache,
const std::vector<bool> *updateMask) {

auto &cacheHandler = *triangulation.getGradientCacheHandler();
Expand Down Expand Up @@ -98,7 +98,6 @@ int DiscreteGradient::buildGradient(const triangulationType &triangulation,
}
}


return 0;
}

Expand Down
4 changes: 2 additions & 2 deletions core/base/discreteMorseSandwich/DiscreteMorseSandwich.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ namespace ttk {
inline int buildGradient(const void *const scalars,
const size_t scalarsMTime,
const SimplexId *const offsets,
const triangulationType &triangulation,
const triangulationType &triangulation,
const std::vector<bool> *updateMask = nullptr) {
this->dg_.setDebugLevel(this->debugLevel_);
this->dg_.setThreadNumber(this->threadNumber_);
Expand Down Expand Up @@ -997,7 +997,7 @@ void ttk::DiscreteMorseSandwich::getSaddleSaddlePairs(
Timer tmseq{};

// extract saddle-saddle pairs from computed boundaries

for(size_t i = 0; i < saddles2.size(); ++i) {
if(!s2Boundaries[i].empty()) {
const auto s2 = saddles2[i];
Expand Down
12 changes: 7 additions & 5 deletions core/base/persistenceDiagram/PersistenceDiagram.h
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,9 @@ namespace ttk {
const scalarType *inputScalars,
const size_t scalarsMTime,
const SimplexId *inputOffsets,
const triangulationType *triangulation,
const std::vector<bool> *updateMask = nullptr);
const triangulationType *triangulation,
const std::vector<bool> *updateMask
= nullptr);

template <class triangulationType>
void checkProgressivityRequirement(const triangulationType *triangulation);
Expand Down Expand Up @@ -397,8 +398,8 @@ int ttk::PersistenceDiagram::execute(std::vector<PersistencePair> &CTDiagram,
executePersistentSimplex(CTDiagram, inputOffsets, triangulation);
break;
case BACKEND::DISCRETE_MORSE_SANDWICH:
executeDiscreteMorseSandwich(
CTDiagram, inputScalars, scalarsMTime, inputOffsets, triangulation, updateMask);
executeDiscreteMorseSandwich(CTDiagram, inputScalars, scalarsMTime,
inputOffsets, triangulation, updateMask);
break;
case BACKEND::PROGRESSIVE_TOPOLOGY:
executeProgressiveTopology(CTDiagram, inputOffsets, triangulation);
Expand Down Expand Up @@ -510,7 +511,8 @@ int ttk::PersistenceDiagram::executeDiscreteMorseSandwich(
Timer const tm{};
const auto dim = triangulation->getDimensionality();

dms_.buildGradient(inputScalars, scalarsMTime, inputOffsets, *triangulation, updateMask);
dms_.buildGradient(
inputScalars, scalarsMTime, inputOffsets, *triangulation, updateMask);
std::vector<DiscreteMorseSandwich::PersistencePair> dms_pairs{};
dms_.computePersistencePairs(
dms_pairs, inputOffsets, *triangulation, this->IgnoreBoundary);
Expand Down

0 comments on commit 9e178cf

Please sign in to comment.