Kaydet (Commit) 888cf441 authored tarafından Mihai Varga's avatar Mihai Varga Kaydeden (comit) Caolán McNamara

fdo#39440 the sSymName parameter is now passed by reference

Change-Id: I7292dd2a03c94fd5366220a62334ef6ebac9296c
Reviewed-on: https://gerrit.libreoffice.org/8450Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 5cab7c7b
......@@ -1201,7 +1201,7 @@ public:
typedef ParallelReductionVectorRef<VectorRef> ParallelNumericRange;
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
......@@ -1321,7 +1321,7 @@ class Binary: public SlidingFunctionBase
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
......@@ -1347,7 +1347,7 @@ class SumOfProduct: public SlidingFunctionBase
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
size_t nCurWindowSize = 0;
FormulaToken *tmpCur = NULL;
......
......@@ -23,7 +23,7 @@ using namespace formula;
namespace sc { namespace opencl {
void OpBesselj::GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
ss << "\ndouble " << sSymName;
ss << "_" << BinFuncName() << "(";
......
......@@ -18,7 +18,7 @@ class OpBesselj: public Normal
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments);
const std::string &sSymName, SubArguments &vSubArguments);
virtual std::string BinFuncName(void) const { return "Besselj"; }
};
......
......@@ -23,7 +23,7 @@ using namespace formula;
namespace sc { namespace opencl {
void OpSumX2MY2::GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
......@@ -80,7 +80,7 @@ void OpSumX2MY2::GenSlidingWindowFunction(std::stringstream &ss,
}
void OpSumX2PY2::GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
......@@ -136,7 +136,7 @@ void OpSumX2PY2::GenSlidingWindowFunction(std::stringstream &ss,
ss << "}";
}
void OpSumXMY2::GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
......
......@@ -18,7 +18,7 @@ class OpSumX2MY2: public CheckVariables
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments);
const std::string &sSymName, SubArguments &vSubArguments);
virtual std::string BinFuncName(void) const { return "SumX2MY2"; }
};
......@@ -26,7 +26,7 @@ class OpSumX2PY2: public CheckVariables
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments);
const std::string &sSymName, SubArguments &vSubArguments);
virtual std::string BinFuncName(void) const { return "SumX2PY2"; }
};
......@@ -34,7 +34,7 @@ class OpSumXMY2: public CheckVariables
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments);
const std::string &sSymName, SubArguments &vSubArguments);
virtual std::string BinFuncName(void) const { return "SumXMY2"; }
};
}}
......
......@@ -22,7 +22,7 @@
namespace sc { namespace opencl {
void OpDmax::GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
......@@ -152,7 +152,7 @@ void OpDmax::GenSlidingWindowFunction(std::stringstream &ss,
}
void OpDmin::GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
......@@ -283,7 +283,7 @@ void OpDmin::GenSlidingWindowFunction(std::stringstream &ss,
}
void OpDproduct::GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
......@@ -412,7 +412,7 @@ void OpDproduct::GenSlidingWindowFunction(std::stringstream &ss,
}
void OpDaverage::GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
......@@ -546,7 +546,7 @@ void OpDaverage::GenSlidingWindowFunction(std::stringstream &ss,
}
void OpDstdev::GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
......@@ -731,7 +731,7 @@ void OpDstdev::GenSlidingWindowFunction(std::stringstream &ss,
}
void OpDstdevp::GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
......@@ -916,7 +916,7 @@ void OpDstdevp::GenSlidingWindowFunction(std::stringstream &ss,
}
void OpDsum::GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
......@@ -1046,7 +1046,7 @@ void OpDsum::GenSlidingWindowFunction(std::stringstream &ss,
}
void OpDvar::GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
......@@ -1231,7 +1231,7 @@ void OpDvar::GenSlidingWindowFunction(std::stringstream &ss,
}
void OpDvarp::GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
......@@ -1416,7 +1416,7 @@ void OpDvarp::GenSlidingWindowFunction(std::stringstream &ss,
}
void OpDcount::GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
......@@ -1547,7 +1547,7 @@ void OpDcount::GenSlidingWindowFunction(std::stringstream &ss,
}
void OpDcount2::GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
......
......@@ -19,7 +19,7 @@ class OpDmax: public CheckVariables
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments);
const std::string &sSymName, SubArguments &vSubArguments);
virtual std::string BinFuncName(void) const { return "Dmax"; }
};
......@@ -27,7 +27,7 @@ class OpDmin: public CheckVariables
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments);
const std::string &sSymName, SubArguments &vSubArguments);
virtual std::string BinFuncName(void) const { return "Dmin"; }
};
......@@ -35,7 +35,7 @@ class OpDproduct: public CheckVariables
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments);
const std::string &sSymName, SubArguments &vSubArguments);
virtual std::string BinFuncName(void) const { return "Dproduct"; }
};
......@@ -43,7 +43,7 @@ class OpDaverage: public CheckVariables
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments);
const std::string &sSymName, SubArguments &vSubArguments);
virtual std::string BinFuncName(void) const { return "Daverage"; }
};
......@@ -51,7 +51,7 @@ class OpDstdev: public CheckVariables
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments);
const std::string &sSymName, SubArguments &vSubArguments);
virtual std::string BinFuncName(void) const { return "Dstdev"; }
};
......@@ -59,7 +59,7 @@ class OpDstdevp: public CheckVariables
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments);
const std::string &sSymName, SubArguments &vSubArguments);
virtual std::string BinFuncName(void) const { return "Dstdevp"; }
};
......@@ -67,7 +67,7 @@ class OpDsum: public CheckVariables
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments);
const std::string &sSymName, SubArguments &vSubArguments);
virtual std::string BinFuncName(void) const { return "Dsum"; }
};
......@@ -75,7 +75,7 @@ class OpDvar: public CheckVariables
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments);
const std::string &sSymName, SubArguments &vSubArguments);
virtual std::string BinFuncName(void) const { return "Dvar"; }
};
......@@ -83,7 +83,7 @@ class OpDvarp: public CheckVariables
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments);
const std::string &sSymName, SubArguments &vSubArguments);
virtual std::string BinFuncName(void) const { return "Dvarp"; }
};
......@@ -91,7 +91,7 @@ class OpDcount: public CheckVariables
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments);
const std::string &sSymName, SubArguments &vSubArguments);
virtual std::string BinFuncName(void) const { return "Dcount"; }
};
......@@ -99,7 +99,7 @@ class OpDcount2: public CheckVariables
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments);
const std::string &sSymName, SubArguments &vSubArguments);
virtual std::string BinFuncName(void) const { return "Dcount2"; }
};
......
......@@ -23,7 +23,7 @@ using namespace formula;
namespace sc { namespace opencl {
void OpAnd::GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
......@@ -107,7 +107,7 @@ void OpAnd::GenSlidingWindowFunction(std::stringstream &ss,
}
void OpOr::GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
......@@ -190,7 +190,7 @@ void OpOr::GenSlidingWindowFunction(std::stringstream &ss,
ss << "}\n";
}
void OpNot::GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
......@@ -229,7 +229,7 @@ void OpNot::GenSlidingWindowFunction(std::stringstream &ss,
}
void OpXor::GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
......
......@@ -19,7 +19,7 @@ class OpAnd: public Normal
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments);
const std::string &sSymName, SubArguments &vSubArguments);
virtual std::string BinFuncName(void) const { return "And"; }
};
......@@ -27,21 +27,21 @@ class OpOr: public Normal
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments);
const std::string &sSymName, SubArguments &vSubArguments);
virtual std::string BinFuncName(void) const { return "Or"; }
};
class OpNot: public Normal
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments);
const std::string &sSymName, SubArguments &vSubArguments);
virtual std::string BinFuncName(void) const { return "Not"; }
};
class OpXor: public Normal
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments);
const std::string &sSymName, SubArguments &vSubArguments);
virtual std::string BinFuncName(void) const { return "Xor"; }
};
......
......@@ -23,7 +23,7 @@ using namespace formula;
namespace sc { namespace opencl {
void OpVLookup::GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments)
const std::string &sSymName, SubArguments &vSubArguments)
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
......
......@@ -18,7 +18,7 @@ class OpVLookup: public CheckVariables
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments);
const std::string &sSymName, SubArguments &vSubArguments);
virtual std::string BinFuncName(void) const { return "VLookup"; }
};
......
......@@ -95,7 +95,7 @@ size_t VectorRef::GetWindowSize(void) const
}
void Normal::GenSlidingWindowFunction(
std::stringstream &ss, const std::string sSymName, SubArguments &vSubArguments)
std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments)
{
ArgVector argVector;
ss << "\ndouble " << sSymName;
......
......@@ -253,7 +253,7 @@ public:
typedef boost::shared_ptr<DynamicKernelArgument> SubArgument;
typedef std::vector<SubArgument> SubArguments;
virtual void GenSlidingWindowFunction(std::stringstream &,
const std::string, SubArguments &) = 0;
const std::string&, SubArguments &) = 0;
virtual ~SlidingFunctionBase() {};
};
......@@ -261,7 +261,7 @@ class Normal: public SlidingFunctionBase
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
const std::string sSymName, SubArguments &vSubArguments);
const std::string &sSymName, SubArguments &vSubArguments);
virtual bool takeString() const { return false; }
virtual bool takeNumeric() const { return true; }
};
......
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