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

fix iterator

Browse Source
This commit is contained in:
Joe Darby
2016-12-17 19:08:45 +00:00
parent 4330028270
commit 0d8b23a60a
2 changed files with 8 additions and 8 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="3168">
<caret line="176" column="3" lean-forward="true" selection-start-line="176" selection-start-column="3" selection-end-line="176" selection-end-column="3" />
<state relative-caret-position="534">
<caret line="165" column="28" lean-forward="false" selection-start-line="165" selection-start-column="28" selection-end-line="165" selection-end-column="28" />
<folding>
<element signature="e#23#54#0" expanded="true" />
</folding>
@@ -255,12 +255,12 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1481992380230</updated>
<workItem from="1481992381575" duration="7661000" />
<workItem from="1481992381575" duration="8284000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="7661000" />
<option name="totallyTimeSpent" value="8284000" />
</component>
<component name="ToolWindowManager">
<frame x="65" y="24" width="1615" height="1026" extended-state="6" />
@@ -364,8 +364,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/main/scala/KMeans.scala">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3168">
<caret line="176" column="3" lean-forward="true" selection-start-line="176" selection-start-column="3" selection-end-line="176" selection-end-column="3" />
<state relative-caret-position="534">
<caret line="165" column="28" lean-forward="false" selection-start-line="165" selection-start-column="28" selection-end-line="165" selection-end-column="28" />
<folding>
<element signature="e#23#54#0" expanded="true" />
</folding>
src/main/scala/KMeans.scala
+2 -2
View File
@@ -163,7 +163,7 @@ object KMeans {
def getMeanVector(a: Array[Float], b: Array[Float], m: Int) : Array[Float] = {
var means = new Array[Float](m)
for (i <- 0 until m) {
means(m) = (a(m) + b(m)) / 2
means(i) = (a(i) + b(i)) / 2
}
means
}
@@ -171,7 +171,7 @@ object KMeans {
def convertRow(row : Row, m: Int) : Array[Float] = {
var dataArray = new Array[Float](m)
for (i <- 0 until m) {
dataArray(m) = row.getInt(m).toFloat
dataArray(i) = row.getInt(i).toFloat
}
dataArray
}