Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from BR_DEBUG_3_2_0b1
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Distribution.cxx
diff --git
a/src/StdMeshers/StdMeshers_Distribution.cxx
b/src/StdMeshers/StdMeshers_Distribution.cxx
index 93858296b6bce1a77ea6492b0a75843bc5ae4d6b..34d0df8531f938fb2de2d1471fb5d335829b43cd 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Distribution.cxx
+++ b/
src/StdMeshers/StdMeshers_Distribution.cxx
@@
-17,7
+17,7
@@
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-//
See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+//
See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
//
//
//
@@
-27,10
+27,8
@@
// $Header$
#include "StdMeshers_Distribution.hxx"
// $Header$
#include "StdMeshers_Distribution.hxx"
-#include <CASCatch_CatchSignals.hxx>
-#include <CASCatch_Failure.hxx>
-#include <CASCatch_ErrorHandler.hxx>
-#include <OSD.hxx>
+#include "CASCatch.hxx"
+
#include <math_GaussSingleIntegration.hxx>
#include <utilities.h>
#include <math_GaussSingleIntegration.hxx>
#include <utilities.h>
@@
-45,20
+43,16
@@
Function::~Function()
bool Function::value( const double, double& f ) const
{
bool Function::value( const double, double& f ) const
{
- CASCatch_CatchSignals aCatchSignals;
- aCatchSignals.Activate();
-
bool ok = true;
if( myConv==0 )
{
CASCatch_TRY
{
bool ok = true;
if( myConv==0 )
{
CASCatch_TRY
{
- f = pow( 10, f );
+ f = pow( 10
.
, f );
}
}
- CASCatch_CATCH(
CASCatch
_Failure)
+ CASCatch_CATCH(
Standard
_Failure)
{
{
- aCatchSignals.Deactivate();
- Handle(CASCatch_Failure) aFail = CASCatch_Failure::Caught();
+ Handle(Standard_Failure) aFail = Standard_Failure::Caught();
f = 0.0;
ok = false;
}
f = 0.0;
ok = false;
}
@@
-128,10
+122,11
@@
double FunctionTable::integral( const int i ) const
double FunctionTable::integral( const int i, const double d ) const
{
double FunctionTable::integral( const int i, const double d ) const
{
- double f, res = 0.0;
- if( value( myData[2*i]+d, f ) )
- res = ( myData[2*i+1] + f ) / 2.0 * d;
-
+ double f1,f2, res = 0.0;
+ if( value( myData[2*i]+d, f1 ) )
+ if(!value(myData[2*i], f2))
+ f2 = myData[2*i+1];
+ res = (f2+f1) * d / 2.0;
return res;
}
return res;
}
@@
-174,22
+169,17
@@
FunctionExpr::FunctionExpr( const char* str, const int conv )
myVars( 1, 1 ),
myValues( 1, 1 )
{
myVars( 1, 1 ),
myValues( 1, 1 )
{
- CASCatch_CatchSignals aCatchSignals;
- aCatchSignals.Activate();
-
bool ok = true;
CASCatch_TRY
{
myExpr = ExprIntrp_GenExp::Create();
myExpr->Process( ( Standard_CString )str );
}
bool ok = true;
CASCatch_TRY
{
myExpr = ExprIntrp_GenExp::Create();
myExpr->Process( ( Standard_CString )str );
}
- CASCatch_CATCH(
CASCatch
_Failure)
+ CASCatch_CATCH(
Standard
_Failure)
{
{
- aCatchSignals.Deactivate();
- Handle(CASCatch_Failure) aFail = CASCatch_Failure::Caught();
+ Handle(Standard_Failure) aFail = Standard_Failure::Caught();
ok = false;
}
ok = false;
}
- aCatchSignals.Deactivate();
if( !ok || !myExpr->IsDone() )
myExpr.Nullify();
if( !ok || !myExpr->IsDone() )
myExpr.Nullify();
@@
-201,7
+191,7
@@
FunctionExpr::~FunctionExpr()
{
}
{
}
-Standard_Boolean FunctionExpr::Value( Standard_Real T, Standard_Real& F )
+Standard_Boolean FunctionExpr::Value(
const
Standard_Real T, Standard_Real& F )
{
double f;
Standard_Boolean res = value( T, f );
{
double f;
Standard_Boolean res = value( T, f );
@@
-214,23
+204,17
@@
bool FunctionExpr::value( const double t, double& f ) const
if( myExpr.IsNull() )
return false;
if( myExpr.IsNull() )
return false;
- OSD::SetSignal( true );
- CASCatch_CatchSignals aCatchSignals;
- aCatchSignals.Activate();
-
( ( TColStd_Array1OfReal& )myValues ).ChangeValue( 1 ) = t;
bool ok = true;
CASCatch_TRY {
f = myExpr->Expression()->Evaluate( myVars, myValues );
}
( ( TColStd_Array1OfReal& )myValues ).ChangeValue( 1 ) = t;
bool ok = true;
CASCatch_TRY {
f = myExpr->Expression()->Evaluate( myVars, myValues );
}
- CASCatch_CATCH(CASCatch_Failure) {
- aCatchSignals.Deactivate();
- Handle(CASCatch_Failure) aFail = CASCatch_Failure::Caught();
+ CASCatch_CATCH(Standard_Failure) {
+ Handle(Standard_Failure) aFail = Standard_Failure::Caught();
f = 0.0;
ok = false;
}
f = 0.0;
ok = false;
}
- aCatchSignals.Deactivate();
ok = Function::value( t, f ) && ok;
return ok;
}
ok = Function::value( t, f ) && ok;
return ok;
}
@@
-244,7
+228,7
@@
double FunctionExpr::integral( const double a, const double b ) const
if( _int.IsDone() )
res = _int.Value();
}
if( _int.IsDone() )
res = _int.Value();
}
- CASCatch_CATCH(
CASCatch
_Failure)
+ CASCatch_CATCH(
Standard
_Failure)
{
res = 0.0;
MESSAGE( "Exception in integral calculating" );
{
res = 0.0;
MESSAGE( "Exception in integral calculating" );