Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed Visual Studio warnings

This commit is contained in:
Jan Steemann 2015-11-19 14:29:49 +01:00
parent 08fe5c4a3e
commit bc3bbc46b5
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -35,6 +35,10 @@ js-*.h
Build64/ Build64/
Build32/ Build32/
Debug64/
Debug32/
Release64/
Release32/
WindowsLibraries WindowsLibraries
Makefile Makefile

13
arangod/Aql/Functions.cpp
View File

@ -4134,6 +4134,8 @@ AqlValue Functions::Percentile (triagens::aql::Query* query,
return AqlValue(new Json(values[0])); return AqlValue(new Json(values[0]));
} }
TRI_ASSERT(l > 1);
if (useInterpolation) { if (useInterpolation) {
double idx = p * (l + 1) / 100; double idx = p * (l + 1) / 100;
double pos = floor(idx); double pos = floor(idx);
@ -4142,15 +4144,22 @@ AqlValue Functions::Percentile (triagens::aql::Query* query,
return AqlValue(new Json(values[l - 1])); return AqlValue(new Json(values[l - 1]));
} }
if (pos <= 0) {
return AqlValue(new Json(Json::Null));
}
double delta = idx - pos; double delta = idx - pos;
return AqlValue(new Json(delta * (values[pos] - values[pos - 1]) + values[pos - 1])); return AqlValue(new Json(delta * (values[static_cast<size_t>(pos)] - values[static_cast<size_t>(pos) - 1]) + values[static_cast<size_t>(pos) - 1]));
} }
double idx = p * l / 100; double idx = p * l / 100;
double pos = ceil(idx); double pos = ceil(idx);
if (pos >= l) { if (pos >= l) {
return AqlValue(new Json(values[l - 1])); return AqlValue(new Json(values[l - 1]));
} }
return AqlValue(new Json(values[pos - 1])); if (pos <= 0) {
return AqlValue(new Json(Json::Null));
}
return AqlValue(new Json(values[static_cast<size_t>(pos) - 1]));
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////