Kaydet (Commit) 9881ac68 authored tarafından Luboš Luňák's avatar Luboš Luňák

better/sane error checking in OpenCL BESSELJ()

Change-Id: I1f1945e7fd2721a320ab11196385e22a70d3da70
Reviewed-on: https://gerrit.libreoffice.org/64542
Tested-by: Jenkins
Reviewed-by: 's avatarLuboš Luňák <l.lunak@collabora.com>
üst 7c692c56
......@@ -43,6 +43,7 @@ static const char* const publicFunc =
"#define IllegalArgument 502\n"
"#define IllegalFPOperation 503 // #NUM!\n"
"#define NoValue 519 // #VALUE!\n"
"#define NoConvergence 523\n"
"#define DivisionByZero 532 // #DIV/0!\n"
"#define NOTAVAILABLE 0x7fff // #N/A\n"
"\n"
......
......@@ -19,6 +19,7 @@ namespace sc { namespace opencl {
void OpBesselj::GenSlidingWindowFunction(std::stringstream &ss,
const std::string &sSymName, SubArguments &vSubArguments)
{
CHECK_PARAMETER_COUNT( 2, 2 );
ss << "\ndouble " << sSymName;
ss << "_" << BinFuncName() << "(";
for (size_t i = 0; i < vSubArguments.size(); i++)
......@@ -31,11 +32,6 @@ void OpBesselj::GenSlidingWindowFunction(std::stringstream &ss,
ss << " int gid0 = get_global_id(0);\n";
ss << " double x = 0.0;\n";
ss << " double N = 0.0;\n";
if(vSubArguments.size() != 2)
{
ss << " return DBL_MAX;\n}\n";
return ;
}
FormulaToken *tmpCur0 = vSubArguments[0]->GetFormulaToken();
assert(tmpCur0);
if(ocPush == vSubArguments[0]->GetFormulaToken()->GetOpCode())
......@@ -58,8 +54,7 @@ void OpBesselj::GenSlidingWindowFunction(std::stringstream &ss,
}
else
{
ss << " return DBL_MAX;\n}\n";
return ;
throw Unhandled(__FILE__, __LINE__);
}
}
else
......@@ -90,8 +85,7 @@ void OpBesselj::GenSlidingWindowFunction(std::stringstream &ss,
}
else
{
ss << " return DBL_MAX;\n}\n";
return ;
throw Unhandled(__FILE__, __LINE__);
}
}
else
......@@ -104,7 +98,7 @@ void OpBesselj::GenSlidingWindowFunction(std::stringstream &ss,
ss << " double f_PI_DIV_2 = f_PI / 2.0;\n";
ss << " double f_PI_DIV_4 = f_PI / 4.0;\n";
ss << " if( N < 0.0 )\n";
ss << " return DBL_MAX;\n";
ss << " return CreateDoubleError(IllegalArgument);\n";
ss << " if (x == 0.0)\n";
ss << " return (N == 0.0) ? 1.0 : 0.0;\n";
ss << " double fSign = ((int)N % 2 == 1 && x < 0.0) ? -1.0 : 1.0;\n";
......@@ -118,7 +112,7 @@ void OpBesselj::GenSlidingWindowFunction(std::stringstream &ss,
ss << " return fSign * sqrt(f_2_DIV_PI/fX)";
ss << "* cos(fX-N*f_PI_DIV_2-f_PI_DIV_4);\n";
ss << " else\n";
ss << " return DBL_MAX;\n";
ss << " return CreateDoubleError(NoConvergence);\n";
ss << " }\n";
ss << " double epsilon = 1.0e-15;\n";
ss << " bool bHasfound = false;\n";
......@@ -179,7 +173,7 @@ void OpBesselj::GenSlidingWindowFunction(std::stringstream &ss,
ss << " if (bHasfound)\n";
ss << " return u * fSign;\n";
ss << " else\n";
ss << " return DBL_MAX;\n";
ss << " return CreateDoubleError(NoConvergence);\n";
ss << "}";
}
void OpGestep::GenSlidingWindowFunction(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment