Kaydet (Commit) 77373d6e authored tarafından shiming zhang's avatar shiming zhang Kaydeden (comit) I-Jui (Ray) Sung

GPU Calc: Fix bug of support optional parameter for VARPA

AMLOEXT-403 FIX

Change-Id: I21e0cd502abfa081885327316bd42e3c1702c494
Signed-off-by: 's avatarhaochen <haochen@multicorewareinc.com>
Signed-off-by: 's avatarWei Wei <weiwei@multicorewareinc.com>
Signed-off-by: 's avatarI-Jui (Ray) Sung <ray@multicorewareinc.com>
üst 94f80ccf
......@@ -10197,6 +10197,7 @@ void OpVarPA::GenSlidingWindowFunction(std::stringstream &ss,
{
const formula::DoubleVectorRefToken* pDVR =
dynamic_cast<const formula::DoubleVectorRefToken *>(pCur);
assert(pDVR);
if(pDVR->GetArrays()[0].mpNumericArray
&& pDVR->GetArrays()[0].mpStringArray)
isMixedDV = svDoubleVectorRefDoubleString;
......@@ -10409,6 +10410,17 @@ void OpVarPA::GenSlidingWindowFunction(std::stringstream &ss,
{
const formula::DoubleVectorRefToken* pDVR =
dynamic_cast<const formula::DoubleVectorRefToken *>(pCur);
assert(pDVR);
if(pDVR->GetArrays()[0].mpNumericArray
&& pDVR->GetArrays()[0].mpStringArray)
isMixedDV = svDoubleVectorRefDoubleString;
else if(pDVR->GetArrays()[0].mpNumericArray)
isMixedDV = svDoubleVectorRefDouble;
else if(pDVR->GetArrays()[0].mpStringArray)
isMixedDV = svDoubleVectorRefString;
else
isMixedDV = svDoubleVectorRefNULL;
size_t nCurWindowSize = pDVR->GetRefRowSize();
ss << " for (int i = ";
if (!pDVR->IsStartFixed() && pDVR->IsEndFixed())
......@@ -10507,6 +10519,16 @@ void OpVarPA::GenSlidingWindowFunction(std::stringstream &ss,
const formula::SingleVectorRefToken* pSVR =
dynamic_cast< const formula::SingleVectorRefToken* >(pCur);
assert(pSVR);
if(pSVR->GetArray().mpNumericArray
&& pSVR->GetArray().mpStringArray)
isMixedSV = svSingleVectorRefDoubleString;
else if(pSVR->GetArray().mpNumericArray)
isMixedSV = svSingleVectorRefDouble;
else if(pSVR->GetArray().mpStringArray)
isMixedSV = svSingleVectorRefString;
else
isMixedSV = svSingleVectorRefNULL;
if(isMixedSV == svSingleVectorRefDoubleString)
{
#ifdef ISNAN
......
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