Added some stuff, deleted some stuff, modified some stuff

This commit is contained in:
RussellChamp committed 2016-03-10 11:54:42 -05:00
1 parent 8454515e67
commit d76dd9c674
16 files changed
+199 -30

No files matched your search

+33 -7
View File
@@ -12,16 +12,42 @@ charset="utf-8"></script>-->
google.load("visualization", "1", {packages:["timeline"]});
data = [];
threshold = 5;
threeDays = 3 * 86400;
oneWeek = 7 * 86400; <!-- seconds in a week -->
jQuery.getJSON("/~krowbar/data/userData.json", function(json) {
_.forEach(json, function(times, user) {
console.log("~" + user + ":", times.length, "item(s)");
_.forEach(times, function(time) {
d = new Date(0);
d.setUTCSeconds(Number(time));
<!--data.push([user, d.toISOString().slice(11,16), d, d]);-->
data.push([user, d, d]);
})
if(times.length > threshold) {
console.log("~" + user + ":", times.length, "item(s)");
_.forEach(times, function(time) {
d = new Date(0);
d.setUTCSeconds((Number(time) + threeDays) % oneWeek - threeDays);
<!--data.push([user, d.toISOString().slice(11,16), d, d]);-->
data.push([user, d, d]);
});
}
});
<!-- compress the data -->
data.sort(); <!-- to get the multi-week dates adjusted-->
timeThreshold = 30 * 60 * 1000; <!-- five minutes in milliseconds -->
removeCount = 0;
for(var i = 0; i < data.length-1;) {
removed = false;
if(data[i][0] == data[i+1][0]) { <!--name check-->
if(data[i][2].getTime() + timeThreshold > data[i+1][1].getTime() &&
data[i][2].getTime() < data[i+1][2].getTime() ) { <!--time check-->
<!-- console.log('Combining items', data[i][2].getTime(), data[i+1][1].getTime()); -->
data[i][2] = data[i+1][2];
data.splice(i+1,1); <!--remove item i+1-->
removed = true;
removeCount++;
}
}
if(!removed) {
i++;
}
}
console.log('Removed', removeCount, 'items');
//google.setOnLoadCallback(drawChart);
$(drawChart);
});
+4
View File
@@ -4,6 +4,10 @@
<div>
<select id="series">
<option value="">Today</option>
<option value="_2016_01">Jan 2016</option>
<option value="_2015_12">Dec 2015</option>
<option value="_2015_11">Nov 2015</option>
<option value="_2015_10">Oct 2015</option>
<option value="_2015_09">Sep 2015</option>
<option value="_2015_08">Aug 2015</option>
<option value="_2015_07">July 2015</option>
+3 -2
View File
@@ -7,7 +7,7 @@
var self = this;
var adjectives = Array('Ancient','Bold','Breaking','Brightest','Brilliant','Crescent','Dark|Darkness','Darkest|Darkness','Desert|Desert','Eternal','Evening|Darkness','Final','First','Forever','Giant|Giant','Glorious|Glory','Joyful|Joy','July','Last','Liberty|Liberty','Magic|Magic','Morning|Morning','Power|Power','Phantom','Present','Righteous','Roaring|Roar|Scream','Rolling','Sand','Screaming|Roar|Scream','Silent','Soaring','Standing|Stand','Star|Star','Stunning','Super','Thunderous|Thunder','Twisted','Urgent','Utopian','Valiant');
var adjectives = Array('Ancient','Bold','Breaking','Brightest','Brilliant','Crescent','Dark|Darkness','Darkest|Darkness','Desert|Desert','Eternal','Evening|Darkness','Final','First','Forever','Giant|Giant','Glorious|Glory','Joyful|Joy','July','Last','Liberty|Liberty','Magic|Magic','Morning|Morning','Power|Power','Phantom','Present','Righteous','Roaring|Roar|Scream','Rolling','Sand','Screaming|Roar|Scream','Silent','Sleeping','Soaring','Standing|Stand','Star|Star','Stunning','Super','Thunderous|Thunder','Twisted','Urgent','Utopian','Valiant');
var nouns = Array('Action','Alert','Bane','Beauty','Claw','Darkness','Dawn','Day','Defense','Desert','Envy','Fall','Fist','Flight','Fury','Guard','Glory','Hammer','Hand','Honor','Hope','Hunt','Hurricane','Joy','Liberty','Light','Lightning','Magic','Morning','October','Power','Rain','Response','Repose','Roar','Scream','Skull','Sky','Skies','Shield','Shout','Stand','Star','Storm','Streak','Strike','Sun','Thunder','Victory','Whisper','Wind','Wrath');
var colors = Array('Black','Blue','Brown','Golden','Gray','Green','Indego','Orange','Purple','Rainbow','Red','Scarlet','Silver','Violet','White','Yellow');
var actors = Array('Cobra','Condor','Dragon','Eagle','Giant','Guardian','Hawk','Hydra','Jackal','King','Knight','Lady','Lion','Scorpion','Spartan','Stranger','Titan','Victor','Viking','Warrior');
@@ -24,7 +24,8 @@ var mission_grammars = Array(
{chance:5, grammar: "{noun1} of {color} {noun2}"},
{chance:10, grammar: "{adj1} {noun1} and {adj2} {noun2}"},
{chance:3, grammar: "Attack of the {actor}s"},
{chance:3, grammar: "Return of the {actor}s"}
{chance:3, grammar: "Return of the {actor}s"},
{chance:1, grammar: "The {actor} Awakens"}
);
this.getNoun = function(badNouns) {
return _.chain(nouns)