 Sam Perry
|
3ae60b8f2b
|
Clustering now working
|
2016-12-19 13:22:16 +00:00 |
|
|
Sam Perry
|
8637825c11
|
Merge branch 'joe-dev2' into sam-dev
|
2016-12-19 12:22:39 +00:00 |
|
|
Sam Perry
|
6e2cd603c4
|
Finished XML Parser
|
2016-12-19 11:57:00 +00:00 |
|
|
Joe Darby
|
6b31903c02
|
calculate m automatically
|
2016-12-18 15:10:16 +00:00 |
|
|
Joe Darby
|
83bd36b139
|
null pointer error handling
|
2016-12-18 14:54:10 +00:00 |
|
|
Joe Darby
|
ee764d78da
|
.
|
2016-12-18 14:33:37 +00:00 |
|
|
Joe Darby
|
9ecc73cb90
|
make data persist
|
2016-12-18 14:20:03 +00:00 |
|
|
Joe Darby
|
ebaa572845
|
working algorithm
|
2016-12-18 14:04:47 +00:00 |
|
|
Joe Darby
|
9e491aa3af
|
try to fix centre ordering problem
|
2016-12-17 20:06:14 +00:00 |
|
|
Joe Darby
|
c57ddd28c2
|
print output correctly
|
2016-12-17 19:43:57 +00:00 |
|
|
Joe Darby
|
0d8b23a60a
|
fix iterator
|
2016-12-17 19:08:45 +00:00 |
|
|
Joe Darby
|
4330028270
|
generalise features
|
2016-12-17 18:55:26 +00:00 |
|
|
Joe Darby
|
169fb3fbf3
|
label centres
|
2016-12-17 18:07:10 +00:00 |
|
|
Joe Darby
|
7245521a78
|
random centres
|
2016-12-17 18:01:30 +00:00 |
|
|
Joe Darby
|
6d1d5858e1
|
refactor iteration
|
2016-12-17 17:29:57 +00:00 |
|
|
joedarby
|
900926fc34
|
find max val
|
2016-12-16 16:34:02 +00:00 |
|
|
joedarby
|
f5755b193c
|
while to for
|
2016-12-16 16:20:07 +00:00 |
|
|
joedarby
|
aecc34c885
|
centres array change
|
2016-12-16 16:18:06 +00:00 |
|
|
joedarby
|
2a62b651fc
|
make random centres
|
2016-12-16 15:01:34 +00:00 |
|
|
Joe Darby
|
543cee8c79
|
blah
|
2016-12-16 14:56:48 +00:00 |
|
|
Sam Perry
|
e04b71cbd5
|
Merge branch 'paul-dev' into sam-dev
|
2016-12-16 14:06:30 +00:00 |
|
|
Sam Perry
|
8253e01584
|
Merge branch 'sam-dev' of github.com:Pezz89/Big_Data_Assignment_2 into sam-dev
|
2016-12-16 14:04:42 +00:00 |
|
|
joedarby
|
d7a10deaab
|
added iterator
|
2016-12-16 14:03:48 +00:00 |
|
|
Joe Darby
|
a2c359b5d7
|
two clusters
|
2016-12-16 14:04:11 +00:00 |
|
|
Sam Perry
|
d3f067bf6a
|
Converted DataFrames to RDDs
|
2016-12-16 14:03:24 +00:00 |
|
|
Paul Campbell
|
cbb470dd73
|
Improved XML Parser
|
2016-12-16 13:58:09 +00:00 |
|
|
Paul Campbell
|
d6262b84ca
|
Merge branch 'sam-dev' into paul-dev
|
2016-12-16 13:44:05 +00:00 |
|
|
Paul Campbell
|
81b6e47e26
|
FUCK
|
2016-12-16 13:42:24 +00:00 |
|
|
Paul Campbell
|
abc8437620
|
Improved XML Parser
|
2016-12-16 13:36:02 +00:00 |
|
|
joedarby
|
ab921cb298
|
one feature, one cluster
|
2016-12-16 13:15:23 +00:00 |
|
|
joedarby
|
a9231d4329
|
Merge branch 'joe-dev2' of https://github.com/Pezz89/Big_Data_Assignment_2 into joe-dev2
|
2016-12-16 13:01:11 +00:00 |
|
|
Joe Darby
|
2eaeb5584c
|
one feature
|
2016-12-16 13:04:57 +00:00 |
|
|
joedarby
|
81a228a28f
|
rgregihrgirg
|
2016-12-16 12:59:55 +00:00 |
|
|
Joe Darby
|
d5098b84a5
|
Merge branch 'joe-dev2' of https://github.com/Pezz89/Big_Data_Assignment_2 into joe-dev2
|
2016-12-16 12:34:07 +00:00 |
|
|
joedarby
|
f4be6cf271
|
select columns
|
2016-12-16 12:32:53 +00:00 |
|
|
joedarby
|
2b534d613c
|
Merge branch 'joe-dev2' of https://github.com/Pezz89/Big_Data_Assignment_2 into joe-dev2
|
2016-12-16 12:27:44 +00:00 |
|
|
joedarby
|
009b4cd33a
|
Merge branch 'sam-dev' into joe-dev2
|
2016-12-16 12:25:32 +00:00 |
|
|
Joe Darby
|
2317b7f0eb
|
Merge branch 'joe-dev2' of https://github.com/Pezz89/Big_Data_Assignment_2 into joe-dev2
|
2016-12-15 23:14:36 +00:00 |
|
|
Joe Darby
|
23a3c3f3fd
|
hardcode centres to test
|
2016-12-15 23:13:50 +00:00 |
|
|
Joe Darby
|
653015c2e1
|
Merge branch 'joe-dev2' of https://github.com/Pezz89/Big_Data_Assignment_2 into joe-dev2
|
2016-12-15 23:07:44 +00:00 |
|
|
Joe Darby
|
8d9ee362af
|
try convert Row to List[Float]
|
2016-12-15 23:06:20 +00:00 |
|
|
Joe Darby
|
9caf118661
|
Merge branch 'joe-dev2' of https://github.com/Pezz89/Big_Data_Assignment_2 into joe-dev2
|
2016-12-15 22:31:17 +00:00 |
|
|
Joe Darby
|
74ad5a0837
|
conv long time to int days
|
2016-12-15 22:30:29 +00:00 |
|
|
Joe Darby
|
34a4533f73
|
modify gitignore
|
2016-12-15 22:19:52 +00:00 |
|
|
Joe Darby
|
728cca7ad3
|
change file path and getFloat
|
2016-12-15 22:16:46 +00:00 |
|
|
Joe Darby
|
f051b61dd9
|
Merge branch 'sam-dev' into joe-dev2
|
2016-12-15 21:39:44 +00:00 |
|
|
Joe Darby
|
26155067a8
|
changed kmeans
|
2016-12-15 21:14:51 +00:00 |
|
|
Joe Darby
|
bd0af2fd2b
|
modify gitignore
|
2016-12-15 21:12:45 +00:00 |
|
|
Joe Darby
|
e1c6a32edf
|
modify gitignore
|
2016-12-15 21:11:17 +00:00 |
|
|
Sam Perry
|
f63e2cd4b2
|
Finished XML parsing sanetization
|
2016-12-15 17:49:47 +00:00 |
|