alex/restaurant-search
1
Fork 0
Code Releases Activity

Fixing bug in computing result density.

Browse Source
This commit is contained in:
Alex Yatskov 2015-04-18 18:52:37 +09:00
parent 54a912cac3
commit 8e30a32b1c
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
static/scripts/grapher.js
View File

@ -95,7 +95,6 @@
var _onValueChanged = params.onValueChanged; var _onValueChanged = params.onValueChanged;
var _range = params.range; var _range = params.range;
var _scale = params.scale; var _scale = params.scale;
var _steps = params.steps;
var _elements = {}; var _elements = {};
function createShapes() { function createShapes() {
@ -194,22 +193,25 @@
} }
function groupHints() { function groupHints() {
var stepSize = _range.length() / _steps;
var hintGroups = []; var hintGroups = [];
for (var i = 0; i < _steps; ++i) {
var stepMax = _range.max - stepSize * i;
var stepMin = stepMax - stepSize;
var hintValue = 0; var stepCount = _data.hints.length;
for (var j = 0, count = _data.hints.length; j < count; ++j) { if (stepCount > 0) {
var hint = _data.hints[j]; var stepSize = _range.length() / stepCount;
if (hint.sample > stepMin && hint.sample <= stepMax) { for (var i = 0; i < stepCount; ++i) {
hintValue += hint.rating; var stepMax = _range.max - stepSize * i;
var stepMin = stepMax - stepSize;
var hintValue = 0;
for (var j = 0, count = _data.hints.length; j < count; ++j) {
var hint = _data.hints[j];
if (hint.sample > stepMin && hint.sample <= stepMax) {
hintValue += hint.rating;
}
} }
}
hintGroups.push(hintValue); hintGroups.push(hintValue);
}
} }
return hintGroups; return hintGroups;
@ -308,7 +310,6 @@
var _columns = {}; var _columns = {};
var _data = {}; var _data = {};
var _range = new Range(-1.0, 1.0); var _range = new Range(-1.0, 1.0);
var _steps = params.steps || 20;
var _useLocalScale = params.useLocalScale || false; var _useLocalScale = params.useLocalScale || false;
var _displayType = params.displayType || 'density'; var _displayType = params.displayType || 'density';
var _onValueChanged = params.onValueChanged; var _onValueChanged = params.onValueChanged;
@ -370,7 +371,6 @@
else { else {
_columns[name] = new Column({ _columns[name] = new Column({
onValueChanged: _onValueChanged, onValueChanged: _onValueChanged,
steps: _steps,
range: _range, range: _range,
canvas: _canvas, canvas: _canvas,
data: columnData, data: columnData,

1
static/scripts/search.js
View File

@ -97,7 +97,6 @@
if (!_.has(_ctx, 'grapher')) { if (!_.has(_ctx, 'grapher')) {
_ctx.grapher = new grapher.Grapher({ _ctx.grapher = new grapher.Grapher({
canvas: new Snap('#svg'), canvas: new Snap('#svg'),
steps: _ctx.query.hintSteps,
onValueChanged: onAdjust, onValueChanged: onAdjust,
displayType: $('#displayType').val(), displayType: $('#displayType').val(),
useLocalScale: $('#useLocalScale').is(':checked') useLocalScale: $('#useLocalScale').is(':checked')