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

label centres

Browse Source
This commit is contained in:
Joe Darby
2016-12-17 18:07:10 +00:00
parent 7245521a78
commit 169fb3fbf3
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+6 -6
View File
@@ -21,8 +21,8 @@
<file leaf-file-name="KMeans.scala" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/scala/KMeans.scala">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
<caret line="25" column="33" lean-forward="true" selection-start-line="25" selection-start-column="33" selection-end-line="25" selection-end-column="33" />
<state relative-caret-position="288">
<caret line="40" column="0" lean-forward="true" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
<folding>
<element signature="e#23#54#0" expanded="true" />
</folding>
@@ -245,12 +245,12 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1481992380230</updated>
<workItem from="1481992381575" duration="4437000" />
<workItem from="1481992381575" duration="4864000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="4437000" />
<option name="totallyTimeSpent" value="4864000" />
</component>
<component name="ToolWindowManager">
<frame x="65" y="24" width="1615" height="1026" extended-state="6" />
@@ -338,8 +338,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/main/scala/KMeans.scala">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
<caret line="25" column="33" lean-forward="true" selection-start-line="25" selection-start-column="33" selection-end-line="25" selection-end-column="33" />
<state relative-caret-position="288">
<caret line="40" column="0" lean-forward="true" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
<folding>
<element signature="e#23#54#0" expanded="true" />
</folding>
src/main/scala/KMeans.scala
+5 -1
View File
@@ -28,8 +28,10 @@ object KMeans {
var centres: Array[Float] = rowsAsArray.takeSample(false, K, System.nanoTime().toInt)
//To reduce chance of two random centres being the same, add i to each
println("centres initialised")
for (i <- 0 until K) {
centres(i) += i
println("centre " + i + " = " + centres(i) )
}
/*var centres : ArrayBuffer[Float] = new ArrayBuffer[Float](K)
@@ -47,7 +49,9 @@ object KMeans {
for (i <- 0 until iterations) {
centres = clustering(centres, rowsAsArray, m, K)
centres.foreach(println)
for (i <- 0 until K) {
println("centre " + i + " = " + centres(i) )
}
}
}