martin/lot
martin/lot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
Martin Donnelly 2016-10-07 13:39:19 +01:00
parent 09f5519dc9
commit 3a6c4b3494
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/data.json
View File

File diff suppressed because one or more lines are too long

39
lot.js
View File

@ -4,7 +4,7 @@ var jsonfile = require('jsonfile'),
https = require('https'), https = require('https'),
UltraSES = require('ultrases'),cron = require('node-cron'); UltraSES = require('ultrases'),cron = require('node-cron');
var file = 'data/data.json' var file = 'data/data.json';
var m = [], var m = [],
prev = [], prev = [],
mo = [], mo = [],
@ -150,8 +150,10 @@ function othercalc() {
var i = 0; var i = 0;
// var p = 1 / ((-1)*re.length); // var p = 1 / ((-1)*re.length);
var p = 1.0 / (re.length); var p = 1.0 / (re.length);
console.log('P', p);
for (i = 0; i < re.length - 1; i++) { for (i = 0; i < re.length - 1; i++) {
console.log((p * i));
// console.log(re[i]); // console.log(re[i]);
for (var s = 1; s < 6; s++) { for (var s = 1; s < 6; s++) {
var cv = re[i][s]; var cv = re[i][s];
@ -164,17 +166,30 @@ function othercalc() {
var flag = false; var flag = false;
for (var t = 0; t < mo.length; t++) { for (var t = 0; t < mo.length; t++) {
if (mo[t].a == cv && mo[t].b == wv) { if (mo[t].a == cv && mo[t].b == wv) {
if (typeof mo[t].c == 'undefined' || mo[t].c == null)
{
mo[t].c = 0;
}
mo[t].c++;
flag = true; flag = true;
mo[t].v++; // mo[t].v++;
/* /*
if (i < (re.length/2)) if (i < (re.length/2))
mo[t].v = mo[t].v - (p * i) mo[t].v = mo[t].v - (p * i)
else else
*/ */
mo[t].v = mo[t].v + (p * i);
// original weighting
//mo[t].v = mo[t].v + (p * i);
//reverse weighting..
mo[t].v = mo[t].v + (1-(p * i));
console.log(mo[t], 1-(p*i));
//; //;
//mo[t].v = mo[t].v + 1; //mo[t].v = mo[t].v + 1;
// ; // ;
} }
} }
if (!flag) { if (!flag) {
@ -433,7 +448,17 @@ function GO() {
console.log(err); console.log(err);
re = obj; re = obj;
resultsQuery(function (a) {
performCalcs();
prepareResults();
console.log(resultsObj);
/* resultsQuery(function (a) {
processData(a); processData(a);
performCalcs(); performCalcs();
@ -442,10 +467,10 @@ function GO() {
console.log(resultsObj); console.log(resultsObj);
sendEmail(); // sendEmail();
saveData(); saveData();
}); });*/
}); });
} }
@ -462,3 +487,5 @@ cron.schedule('1 00 18 * * 2,5', function(){
// console.log('tick'); // console.log('tick');
return -1; return -1;
}); });
GO();