Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated copyright message
[modules/kernel.git]
/
src
/
DSC
/
DSC_User
/
Datastream
/
AdjacentFunctor.hxx
diff --git
a/src/DSC/DSC_User/Datastream/AdjacentFunctor.hxx
b/src/DSC/DSC_User/Datastream/AdjacentFunctor.hxx
index 2f6e757c1ca0931f6110cf4f3ff05e697ae037fd..a3d6d6ea3c12eb561108d788bce009008fbc1879 100644
(file)
--- a/
src/DSC/DSC_User/Datastream/AdjacentFunctor.hxx
+++ b/
src/DSC/DSC_User/Datastream/AdjacentFunctor.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
13 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
23 CEA, EDF
, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-34,8
+34,7
@@
// Pour affichage
#include "DisplayPair.hxx"
//
// Pour affichage
#include "DisplayPair.hxx"
//
-
-//#define MYDEBUG
+#include "utilities.h"
// Suppose que le container est trié
template < typename T > struct AdjacentFunctor {
// Suppose que le container est trié
template < typename T > struct AdjacentFunctor {
@@
-53,31
+52,34
@@
template < typename T > struct AdjacentFunctor {
// Suppose que les valeurs passées en paramètres sont triées par ordre croissant
bool operator()(const T &v1) {
// Suppose que les valeurs passées en paramètres sont triées par ordre croissant
bool operator()(const T &v1) {
-#ifdef MYDEBUG
- std::cout << "AdjacentFunctor: " << _minValue << _maxValue << std::endl;
- std::cout << "AdjacentFunctor: " << _min << _max << std::endl;
-#endif
+ if (SALOME::VerbosityActivated())
+ {
+ std::cout << "AdjacentFunctor: " << _minValue << _maxValue << std::endl;
+ std::cout << "AdjacentFunctor: " << _min << _max << std::endl;
+ }
+
if ( v1 <= _minValue && v1 >= _maxValue)
{
_equal= true;
if ( v1 <= _minValue && v1 >= _maxValue)
{
_equal= true;
-#ifdef MYDEBUG
- std::cout << "AdjacentFunctor: _equal : " << v1 << std::endl;
-#endif
+
+ if (SALOME::VerbosityActivated())
+ std::cout << "AdjacentFunctor: _equal : " << v1 << std::endl;
+
return true;
}
if ( v1 < _minValue )
{
_min=v1;_minFound=true;
return true;
}
if ( v1 < _minValue )
{
_min=v1;_minFound=true;
-#ifdef MYDEBUG
- std::cout << "AdjacentFunctor: _minFound : " <<_min << std::endl;
-#endif
+
+ if (SALOME::VerbosityActivated())
+ std::cout << "AdjacentFunctor: _minFound : " <<_min << std::endl;
}
else if ( v1 > _maxValue )
{
_max=v1;_maxFound=true;
}
else if ( v1 > _maxValue )
{
_max=v1;_maxFound=true;
-#ifdef MYDEBUG
- std::cout << "AdjacentFunctor: _maxFound : " <<_max << std::endl;
-#endif
+
+ if (SALOME::VerbosityActivated())
+ std::cout << "AdjacentFunctor: _maxFound : " <<_max << std::endl;
}
}
@@
-104,9
+106,9
@@
template < typename T > struct AdjacentFunctor {
bool isEqual() const { return _equal;}
bool isBounded() const { return _minFound && _maxFound;}
bool getBounds(TNoConst & min, TNoConst & max) const {
bool isEqual() const { return _equal;}
bool isBounded() const { return _minFound && _maxFound;}
bool getBounds(TNoConst & min, TNoConst & max) const {
-#ifdef MYDEBUG
- std::cout << "_minFound : " <<_minFound << ", _maxFound " << _maxFound << std::endl;
-#endif
+ if (SALOME::VerbosityActivated())
+
std::cout << "_minFound : " <<_minFound << ", _maxFound " << _maxFound << std::endl;
+
if (_minFound && _maxFound ) { min=_min; max=_max; return true; }
return false;
}
if (_minFound && _maxFound ) { min=_min; max=_max; return true; }
return false;
}