-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2020 CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "Model_Expression.h"
double Model_ExpressionDouble::value()
{
- if (myIsInitialized)
+ if (myIsInitialized && !myReal.IsNull())
return myReal->Get();
return std::numeric_limits<double>::max(); // error
}
int Model_ExpressionInteger::value()
{
- if (myIsInitialized)
+ if (myIsInitialized && !myInteger.IsNull())
return myInteger->Get();
return std::numeric_limits<int>::max(); // error
}