bp/Big_Data_Assignment_2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 0cf27a769a include report master joe-dev2 Joe Darby 2016-12-19 17:18:43 +00:00
  • a1ee8e06ab final commit Joe Darby 2016-12-19 17:17:55 +00:00
  • 13399dd85f add 2d results file Joe Darby 2016-12-19 16:03:06 +00:00
  • 5fd3555865 fix date parsing Joe Darby 2016-12-19 15:14:49 +00:00
  • 76950fb467 add results saveAsTextFile Joe Darby 2016-12-19 14:14:44 +00:00
  • 2ef677443b Merge branch 'joe-dev2' of https://github.com/Pezz89/Big_Data_Assignment_2 into joe-dev2 Joe Darby 2016-12-19 13:41:38 +00:00
  • 498c6ba67a add counts function Joe Darby 2016-12-19 13:39:43 +00:00
  • 3ae60b8f2b Clustering now working sam-dev Sam Perry 2016-12-19 13:22:16 +00:00
  • 8637825c11 Merge branch 'joe-dev2' into sam-dev Sam Perry 2016-12-19 12:22:39 +00:00
  • 6e2cd603c4 Finished XML Parser Sam Perry 2016-12-19 11:57:00 +00:00
  • 86b512234a Hack not working yet... sam-hack_branch Sam Perry 2016-12-19 11:21:16 +00:00
  • 6b31903c02 calculate m automatically Joe Darby 2016-12-18 15:10:16 +00:00
  • 83bd36b139 null pointer error handling Joe Darby 2016-12-18 14:54:10 +00:00
  • ee764d78da . Joe Darby 2016-12-18 14:33:37 +00:00
  • 9ecc73cb90 make data persist Joe Darby 2016-12-18 14:20:03 +00:00
  • ebaa572845 working algorithm Joe Darby 2016-12-18 14:04:47 +00:00
  • 3d648b26f7 first draft of report paul-dev Paul Campbell 2016-12-17 20:12:21 +00:00
  • 9e491aa3af try to fix centre ordering problem Joe Darby 2016-12-17 20:06:14 +00:00
  • c57ddd28c2 print output correctly Joe Darby 2016-12-17 19:43:57 +00:00
  • 0d8b23a60a fix iterator Joe Darby 2016-12-17 19:08:45 +00:00
  • 4330028270 generalise features Joe Darby 2016-12-17 18:55:26 +00:00
  • 169fb3fbf3 label centres Joe Darby 2016-12-17 18:07:10 +00:00
  • 7245521a78 random centres Joe Darby 2016-12-17 18:01:30 +00:00
  • 6d1d5858e1 refactor iteration Joe Darby 2016-12-17 17:29:57 +00:00
  • 900926fc34 find max val joedarby 2016-12-16 16:34:02 +00:00
  • f5755b193c while to for joedarby 2016-12-16 16:20:07 +00:00
  • aecc34c885 centres array change joedarby 2016-12-16 16:18:06 +00:00
  • 100aab773a HAck Sam Perry 2016-12-16 16:05:26 +00:00
  • 2a62b651fc make random centres joedarby 2016-12-16 15:01:34 +00:00
  • 543cee8c79 blah Joe Darby 2016-12-16 14:56:48 +00:00
  • e04b71cbd5 Merge branch 'paul-dev' into sam-dev Sam Perry 2016-12-16 14:06:30 +00:00
  • 8253e01584 Merge branch 'sam-dev' of github.com:Pezz89/Big_Data_Assignment_2 into sam-dev Sam Perry 2016-12-16 14:04:42 +00:00
  • d7a10deaab added iterator joedarby 2016-12-16 14:03:48 +00:00
  • a2c359b5d7 two clusters Joe Darby 2016-12-16 14:04:11 +00:00
  • d3f067bf6a Converted DataFrames to RDDs Sam Perry 2016-12-16 14:03:24 +00:00
  • cbb470dd73 Improved XML Parser Paul Campbell 2016-12-16 13:58:09 +00:00
  • d6262b84ca Merge branch 'sam-dev' into paul-dev Paul Campbell 2016-12-16 13:44:05 +00:00
  • 81b6e47e26 FUCK Paul Campbell 2016-12-16 13:42:24 +00:00
  • abc8437620 Improved XML Parser Paul Campbell 2016-12-16 13:36:02 +00:00
  • ab921cb298 one feature, one cluster joedarby 2016-12-16 13:15:23 +00:00
  • a9231d4329 Merge branch 'joe-dev2' of https://github.com/Pezz89/Big_Data_Assignment_2 into joe-dev2 joedarby 2016-12-16 13:01:11 +00:00
  • 2eaeb5584c one feature Joe Darby 2016-12-16 13:04:57 +00:00
  • 81a228a28f rgregihrgirg joedarby 2016-12-16 12:59:55 +00:00
  • d5098b84a5 Merge branch 'joe-dev2' of https://github.com/Pezz89/Big_Data_Assignment_2 into joe-dev2 Joe Darby 2016-12-16 12:34:07 +00:00
  • f4be6cf271 select columns joedarby 2016-12-16 12:32:53 +00:00
  • 2b534d613c Merge branch 'joe-dev2' of https://github.com/Pezz89/Big_Data_Assignment_2 into joe-dev2 joedarby 2016-12-16 12:27:44 +00:00
  • 009b4cd33a Merge branch 'sam-dev' into joe-dev2 joedarby 2016-12-16 12:25:32 +00:00
  • 2317b7f0eb Merge branch 'joe-dev2' of https://github.com/Pezz89/Big_Data_Assignment_2 into joe-dev2 Joe Darby 2016-12-15 23:14:36 +00:00
  • 23a3c3f3fd hardcode centres to test Joe Darby 2016-12-15 23:13:50 +00:00
  • 653015c2e1 Merge branch 'joe-dev2' of https://github.com/Pezz89/Big_Data_Assignment_2 into joe-dev2 Joe Darby 2016-12-15 23:07:44 +00:00
  • 8d9ee362af try convert Row to List[Float] Joe Darby 2016-12-15 23:06:20 +00:00
  • 9caf118661 Merge branch 'joe-dev2' of https://github.com/Pezz89/Big_Data_Assignment_2 into joe-dev2 Joe Darby 2016-12-15 22:31:17 +00:00
  • 74ad5a0837 conv long time to int days Joe Darby 2016-12-15 22:30:29 +00:00
  • 34a4533f73 modify gitignore Joe Darby 2016-12-15 22:19:52 +00:00
  • 728cca7ad3 change file path and getFloat Joe Darby 2016-12-15 22:16:46 +00:00
  • f051b61dd9 Merge branch 'sam-dev' into joe-dev2 Joe Darby 2016-12-15 21:39:44 +00:00
  • 26155067a8 changed kmeans Joe Darby 2016-12-15 21:14:51 +00:00
  • bd0af2fd2b modify gitignore Joe Darby 2016-12-15 21:12:45 +00:00
  • e1c6a32edf modify gitignore Joe Darby 2016-12-15 21:11:17 +00:00
  • f63e2cd4b2 Finished XML parsing sanetization Sam Perry 2016-12-15 17:49:47 +00:00
  • c9c718dbe8 Fixed xml tag bug Sam Perry 2016-12-15 17:31:13 +00:00
  • 3d39ad082c first iteration joedarby 2016-12-15 16:39:43 +00:00
  • e90318a9a7 k means, find centres joedarby 2016-12-15 16:04:14 +00:00
  • f4e555ab9a Commented XML Parser Sam Perry 2016-12-15 15:00:54 +00:00
  • 8ef2828723 Finished XML Parser data casting Sam Perry 2016-12-15 14:13:33 +00:00
  • c3c01fe9e8 make clustering use spark map joedarby 2016-12-15 13:15:36 +00:00
  • 32e774819e Almost finished casting XML for DataFrames Sam Perry 2016-12-15 13:07:18 +00:00
  • 6e81f200bc modify git ignore joedarby 2016-12-15 12:48:42 +00:00
  • 2b94c26073 delete target folder joedarby 2016-12-15 12:48:12 +00:00
  • 156b6c711a stage one k means joedarby 2016-12-15 12:47:17 +00:00
  • a19d05cebb Merge branch 'sam-dev' Sam Perry 2016-12-14 14:42:46 +00:00
  • b41d085184 Pre-master merge commit Sam Perry 2016-12-14 14:41:25 +00:00
  • a832da7a77 working feature parsing joe-dev Joe Darby 2016-12-14 00:12:49 +00:00
  • 36ee19d7d9 generalise features Joe Darby 2016-12-13 21:31:07 +00:00
  • 45b97e6155 modify gitignore Joe Darby 2016-12-13 21:13:30 +00:00
  • c2ceb855d7 get ages Joe Darby 2016-12-13 19:58:08 +00:00
  • 05c219aa6d testing Joe Darby 2016-12-13 19:42:26 +00:00
  • f4e7840033 first attempt at age parse Joe Darby 2016-12-13 18:45:35 +00:00
  • 4d2d031583 modify gitignore Joe Darby 2016-12-13 17:55:17 +00:00
  • f491d78c41 Restructured and commented project Sam Perry 2016-12-03 15:56:13 +00:00
  • effdd77520 Finished implementing XML parser object Sam Perry 2016-12-03 13:45:08 +00:00
  • 7abdd89631 Finished basic xml parser for Badges.txt Sam Perry 2016-12-03 00:09:18 +00:00
  • e824e87c57 Created basic word count spark project Sam Perry 2016-11-30 22:36:39 +00:00
  • 283991656b Initial commit edward-dev Sam Perry 2016-11-21 18:14:01 +00:00