First update.
This commit is contained in:
@@ -6,10 +6,10 @@ using namespace Aurora;
|
||||
|
||||
namespace
|
||||
{
|
||||
double getTemperatureForTas(const Matrix& aTasTemperature, double aTasNum, double aMotorPos, const Matrix& aReferenceTemps,
|
||||
double aMinTemperature, double aMaxTemperature)
|
||||
float getTemperatureForTas(const Matrix& aTasTemperature, float aTasNum, float aMotorPos, const Matrix& aReferenceTemps,
|
||||
float aMinTemperature, float aMaxTemperature)
|
||||
{
|
||||
double result = NAN;
|
||||
float result = NAN;
|
||||
if(aMotorPos == 1)
|
||||
{
|
||||
for(int i=0; i<aTasTemperature.getDimSize(1); ++i)
|
||||
@@ -49,10 +49,10 @@ namespace
|
||||
|
||||
|
||||
Matrix Recon::extractTasTemperature(const Matrix& aTasTemperature, const Matrix& aTasList, const Matrix& aMotorPosList, const Matrix& aDefaultTemps,
|
||||
double aMinTemperature, double aMaxTemperature)
|
||||
float aMinTemperature, float aMaxTemperature)
|
||||
{
|
||||
size_t resultSize = aTasList.getDataSize() * aMotorPosList.getDataSize();
|
||||
double* resultData = Aurora::malloc(resultSize);
|
||||
float* resultData = Aurora::malloc(resultSize);
|
||||
for(int i=0; i<aMotorPosList.getDataSize(); ++i)
|
||||
{
|
||||
for(int j=0; j<aTasList.getDataSize(); ++j)
|
||||
|
||||
@@ -14,7 +14,7 @@ namespace Recon
|
||||
};
|
||||
|
||||
Aurora::Matrix extractTasTemperature(const Aurora::Matrix& aTasTemperature, const Aurora::Matrix& aTasList, const Aurora::Matrix& aMotorPosList,
|
||||
const Aurora::Matrix& aDefaultTemps,double aMinTemperature, double aMaxTemperature);
|
||||
const Aurora::Matrix& aDefaultTemps,float aMinTemperature, float aMaxTemperature);
|
||||
}
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user