1

Fixing renamed files

This commit is contained in:
Alex Yatskov 2015-03-15 17:10:55 +09:00
parent c0d543cef1
commit 20afc3f165
3 changed files with 375 additions and 375 deletions

352
server/index.js Normal file → Executable file
View File

@ -24,317 +24,55 @@
'use strict'; 'use strict';
var _ = require('underscore'); var _ = require('underscore');
var geolib = require('geolib'); var express = require('express');
var mysql = require('mysql'); var path = require('path');
var pool = null; var search = require('./search.js');
function innerProduct(values1, values2) { function main(staticFiles, port) {
var result = 0.0; var app = express();
for (var feature in values1) { search.loadDb({
if (feature in values2) { connectionLimit: 10,
result += values1[feature] * values2[feature]; database: 'hscd',
} host: 'localhost',
} user: 'hscd'
});
return result; app.use('/query', function(req, res) {
search.runQuery(req.query, function(results) {
res.json(results);
});
});
app.use('/categories', function(req, res) {
search.getCategories(function(results) {
res.json(results);
});
});
app.use('/learn', function(req, res) {
search.addCategory(req.query, function(results) {
res.json(results);
});
});
app.use('/forget', function(req, res) {
search.removeCategory(req.query, function(results) {
res.json(results);
});
});
app.use('/access', function(req, res) {
search.accessReview(req.query, function(results) {
res.json(results);
});
});
app.use(express.static(path.join(__dirname, '..', staticFiles)));
app.listen(port);
} }
function walkMatches(data, features, minScore, callback) { if (require.main === module) {
for (var i = 0, count = data.length; i < count; ++i) { main('client', 3000);
var record = data[i];
var score = innerProduct(features, record.features);
if (score >= minScore) {
callback(record, score);
}
}
} }
function countRecords(data, features, minScore) {
var count = 0;
walkMatches(data, features, minScore, function(record, score) {
++count;
});
return count;
}
function findRecords(data, features, minScore) {
var results = [];
walkMatches(data, features, minScore, function(record, score) {
results.push({
name: record.name,
score: score,
distanceToUser: record.distanceToUser / 1000.0,
distanceToStn: record.distanceToStn / 1000.0,
closestStn: record.closestStn,
id: record.id
});
});
results.sort(function(a, b) {
return b.score - a.score;
});
return results;
}
function step(range, steps, callback) {
var stepSize = (range.max - range.min) / steps;
for (var i = 0; i < steps; ++i) {
var stepMax = range.max - stepSize * i;
var stepMin = stepMax - stepSize;
var stepMid = (stepMin + stepMax) / 2;
callback(stepMid);
}
}
function project(data, features, feature, minScore, range, steps) {
var sample = _.clone(features);
var results = [];
step(range, steps, function(position) {
sample[feature] = position;
results.push({
sample: position,
count: countRecords(data, sample, minScore)
});
});
return results;
}
function buildHints(data, features, feature, minScore, range, steps) {
var projection = project(
data,
features,
feature,
minScore,
range,
steps
);
var hints = [];
_.each(projection, function(result) {
hints.push({
sample: result.sample,
count: result.count
});
});
return hints;
}
function loadDb(params) {
pool = mysql.createPool(params);
}
function getRecords(context, callback) {
pool.query('SELECT * FROM reviews', function(err, rows) {
if (err) {
throw err;
}
var records = _.map(rows, function(row) {
return {
name: row.name,
id: row.id,
closestStn: row.closestStn,
distanceToStn: row.distanceToStn,
geo: {
latitude: row.latitude,
longitude: row.longitude
},
features: {
delicious: row.delicious,
accomodating: row.accomodating,
affordable: row.affordable,
atmospheric: row.atmospheric
},
};
});
computeRecordGeo(records, context);
callback(records);
});
}
function computeRecordGeo(records, context) {
var distUserMin = Number.MAX_VALUE;
var distUserMax = Number.MIN_VALUE;
_.each(records, function(record) {
record.distanceToUser = 0.0;
if (context.geo) {
record.distanceToUser = geolib.getDistance(record.geo, context.geo);
}
distUserMin = Math.min(distUserMin, record.distanceToUser);
distUserMax = Math.max(distUserMax, record.distanceToUser);
});
var distUserRange = distUserMax - distUserMin;
_.each(records, function(record) {
record.features.nearby = -((record.distanceToUser - distUserMin) / distUserRange - 0.5) * 2.0;
record.features.accessible = 1.0 - (record.distanceToStn / context.walkingDist);
record.features.accessible = Math.min(record.features.accessible, 1.0);
record.features.accessible = Math.max(record.features.accessible, -1.0);
});
}
function sanitizeQuery(query) {
var keys = [
'delicious',
'accomodating',
'affordable',
'atmospheric',
'nearby',
'accessible'
];
var features = {};
_.each(keys, function(key) {
features[key] = _.has(query.features, key) ? query.features[key] : 0;
});
query.features = features;
for (var category in query.profile) {
if (parseFloat(query.profile[category]) === 0) {
delete query.profile[category];
}
}
}
function getCategories(callback) {
pool.query('SELECT * FROM categories', function(err, rows) {
if (err) {
throw err;
}
var categories = _.map(rows, function(row) {
return {id: row.id, description: row.description};
});
callback(categories);
});
}
function addCategory(query, callback) {
var description = query.description.trim();
if (description) {
pool.query('INSERT INTO categories(description) VALUES(?)', [description], function(err, info) {
if (err) {
throw err;
}
callback({
id: info.insertId,
description: description,
success: true
});
});
}
else {
callback({success: false});
}
}
function removeCategory(query, callback) {
pool.query('DELETE FROM categories WHERE id = (?)', [query.id], function(err, info) {
if (err) {
throw err;
}
callback({success: info.affectedRows > 0});
});
}
function accessReview(query, callback) {
pool.query('SELECT url FROM reviews WHERE id = (?) LIMIT 1', [query.id], function(err, rows) {
if (err) {
throw err;
}
var results = {
success: rows.length > 0
};
if (results.success) {
results.url = 'http://www.tripadvisor.com' + rows[0].url;
pool.query('INSERT INTO history(date, reviewId) VALUES(NOW(), ?)', [query.id], function(err, info) {
if (err) {
throw err;
}
for (var categoryId in query.profile) {
pool.query(
'INSERT INTO historyGroups(categoryId, categoryValue, historyId) VALUES(?, ?, ?)',
[categoryId, query.profile[categoryId], info.insertId]
);
}
});
}
callback(results);
});
}
function runQuery(query, callback) {
sanitizeQuery(query);
var context = {
geo: query.geo,
walkingDist: query.walkingDist * 1000.0
};
getRecords(context, function(data) {
var searchResults = findRecords(
data,
query.features,
query.minScore
);
var graphColumns = {};
for (var feature in query.features) {
var searchHints = buildHints(
data,
query.features,
feature,
query.minScore,
query.range,
query.hintSteps
);
graphColumns[feature] = {
value: query.features[feature],
hints: searchHints,
steps: query.hintSteps
};
}
callback({
columns: graphColumns,
items: searchResults.slice(0, query.maxResults),
count: searchResults.length
});
});
}
module.exports = {
loadDb: loadDb,
runQuery: runQuery,
getCategories: getCategories,
addCategory: addCategory,
removeCategory: removeCategory,
accessReview: accessReview
};

340
server/search.js Normal file
View File

@ -0,0 +1,340 @@
#!/usr/bin/env node
/*
* Copyright (c) 2015 Alex Yatskov <alex@foosoft.net>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
* the Software, and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
'use strict';
var _ = require('underscore');
var geolib = require('geolib');
var mysql = require('mysql');
var pool = null;
function innerProduct(values1, values2) {
var result = 0.0;
for (var feature in values1) {
if (feature in values2) {
result += values1[feature] * values2[feature];
}
}
return result;
}
function walkMatches(data, features, minScore, callback) {
for (var i = 0, count = data.length; i < count; ++i) {
var record = data[i];
var score = innerProduct(features, record.features);
if (score >= minScore) {
callback(record, score);
}
}
}
function countRecords(data, features, minScore) {
var count = 0;
walkMatches(data, features, minScore, function(record, score) {
++count;
});
return count;
}
function findRecords(data, features, minScore) {
var results = [];
walkMatches(data, features, minScore, function(record, score) {
results.push({
name: record.name,
score: score,
distanceToUser: record.distanceToUser / 1000.0,
distanceToStn: record.distanceToStn / 1000.0,
closestStn: record.closestStn,
id: record.id
});
});
results.sort(function(a, b) {
return b.score - a.score;
});
return results;
}
function step(range, steps, callback) {
var stepSize = (range.max - range.min) / steps;
for (var i = 0; i < steps; ++i) {
var stepMax = range.max - stepSize * i;
var stepMin = stepMax - stepSize;
var stepMid = (stepMin + stepMax) / 2;
callback(stepMid);
}
}
function project(data, features, feature, minScore, range, steps) {
var sample = _.clone(features);
var results = [];
step(range, steps, function(position) {
sample[feature] = position;
results.push({
sample: position,
count: countRecords(data, sample, minScore)
});
});
return results;
}
function buildHints(data, features, feature, minScore, range, steps) {
var projection = project(
data,
features,
feature,
minScore,
range,
steps
);
var hints = [];
_.each(projection, function(result) {
hints.push({
sample: result.sample,
count: result.count
});
});
return hints;
}
function loadDb(params) {
pool = mysql.createPool(params);
}
function getRecords(context, callback) {
pool.query('SELECT * FROM reviews', function(err, rows) {
if (err) {
throw err;
}
var records = _.map(rows, function(row) {
return {
name: row.name,
id: row.id,
closestStn: row.closestStn,
distanceToStn: row.distanceToStn,
geo: {
latitude: row.latitude,
longitude: row.longitude
},
features: {
delicious: row.delicious,
accomodating: row.accomodating,
affordable: row.affordable,
atmospheric: row.atmospheric
},
};
});
computeRecordGeo(records, context);
callback(records);
});
}
function computeRecordGeo(records, context) {
var distUserMin = Number.MAX_VALUE;
var distUserMax = Number.MIN_VALUE;
_.each(records, function(record) {
record.distanceToUser = 0.0;
if (context.geo) {
record.distanceToUser = geolib.getDistance(record.geo, context.geo);
}
distUserMin = Math.min(distUserMin, record.distanceToUser);
distUserMax = Math.max(distUserMax, record.distanceToUser);
});
var distUserRange = distUserMax - distUserMin;
_.each(records, function(record) {
record.features.nearby = -((record.distanceToUser - distUserMin) / distUserRange - 0.5) * 2.0;
record.features.accessible = 1.0 - (record.distanceToStn / context.walkingDist);
record.features.accessible = Math.min(record.features.accessible, 1.0);
record.features.accessible = Math.max(record.features.accessible, -1.0);
});
}
function sanitizeQuery(query) {
var keys = [
'delicious',
'accomodating',
'affordable',
'atmospheric',
'nearby',
'accessible'
];
var features = {};
_.each(keys, function(key) {
features[key] = _.has(query.features, key) ? query.features[key] : 0;
});
query.features = features;
for (var category in query.profile) {
if (parseFloat(query.profile[category]) === 0) {
delete query.profile[category];
}
}
}
function getCategories(callback) {
pool.query('SELECT * FROM categories', function(err, rows) {
if (err) {
throw err;
}
var categories = _.map(rows, function(row) {
return {id: row.id, description: row.description};
});
callback(categories);
});
}
function addCategory(query, callback) {
var description = query.description.trim();
if (description) {
pool.query('INSERT INTO categories(description) VALUES(?)', [description], function(err, info) {
if (err) {
throw err;
}
callback({
id: info.insertId,
description: description,
success: true
});
});
}
else {
callback({success: false});
}
}
function removeCategory(query, callback) {
pool.query('DELETE FROM categories WHERE id = (?)', [query.id], function(err, info) {
if (err) {
throw err;
}
callback({success: info.affectedRows > 0});
});
}
function accessReview(query, callback) {
pool.query('SELECT url FROM reviews WHERE id = (?) LIMIT 1', [query.id], function(err, rows) {
if (err) {
throw err;
}
var results = {
success: rows.length > 0
};
if (results.success) {
results.url = 'http://www.tripadvisor.com' + rows[0].url;
pool.query('INSERT INTO history(date, reviewId) VALUES(NOW(), ?)', [query.id], function(err, info) {
if (err) {
throw err;
}
for (var categoryId in query.profile) {
pool.query(
'INSERT INTO historyGroups(categoryId, categoryValue, historyId) VALUES(?, ?, ?)',
[categoryId, query.profile[categoryId], info.insertId]
);
}
});
}
callback(results);
});
}
function runQuery(query, callback) {
sanitizeQuery(query);
var context = {
geo: query.geo,
walkingDist: query.walkingDist * 1000.0
};
getRecords(context, function(data) {
var searchResults = findRecords(
data,
query.features,
query.minScore
);
var graphColumns = {};
for (var feature in query.features) {
var searchHints = buildHints(
data,
query.features,
feature,
query.minScore,
query.range,
query.hintSteps
);
graphColumns[feature] = {
value: query.features[feature],
hints: searchHints,
steps: query.hintSteps
};
}
callback({
columns: graphColumns,
items: searchResults.slice(0, query.maxResults),
count: searchResults.length
});
});
}
module.exports = {
loadDb: loadDb,
runQuery: runQuery,
getCategories: getCategories,
addCategory: addCategory,
removeCategory: removeCategory,
accessReview: accessReview
};

View File

@ -1,78 +0,0 @@
#!/usr/bin/env node
/*
* Copyright (c) 2015 Alex Yatskov <alex@foosoft.net>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
* the Software, and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
'use strict';
var _ = require('underscore');
var express = require('express');
var path = require('path');
var search = require('./search.js');
function main(staticFiles, port) {
var app = express();
search.loadDb({
connectionLimit: 10,
database: 'hscd',
host: 'localhost',
user: 'hscd'
});
app.use('/query', function(req, res) {
search.runQuery(req.query, function(results) {
res.json(results);
});
});
app.use('/categories', function(req, res) {
search.getCategories(function(results) {
res.json(results);
});
});
app.use('/learn', function(req, res) {
search.addCategory(req.query, function(results) {
res.json(results);
});
});
app.use('/forget', function(req, res) {
search.removeCategory(req.query, function(results) {
res.json(results);
});
});
app.use('/access', function(req, res) {
search.accessReview(req.query, function(results) {
res.json(results);
});
});
app.use(express.static(path.join(__dirname, '..', staticFiles)));
app.listen(port);
}
if (require.main === module) {
main('client', 3000);
}