fix DenseMatrix Store bugs

Peng Meng · Peng Meng · commit 4a9b35031b00 · 2017-07-17T11:18:06.000+08:00
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/recommendation/MatrixFactorizationModel.scala b/mllib/src/main/scala/org/apache/spark/mllib/recommendation/MatrixFactorizationModel.scala
@@ -319,7 +319,7 @@ object MatrixFactorizationModel extends Loader[MatrixFactorizationModel] {
           j += num
           pq.clear()
         }
-        (index, (srcIds, dstIdMatrix, new DenseMatrix(m, num, scoreMatrix)))
+        (index, (srcIds, dstIdMatrix, new DenseMatrix(m, num, scoreMatrix, true)))
     }
     ratings.aggregateByKey(null: Array[Int], null: Array[Int], null: DenseMatrix)(
       (rateSum, rate) => mergeFunc(rateSum, rate, num),
@@ -366,7 +366,7 @@ object MatrixFactorizationModel extends Loader[MatrixFactorizationModel] {
             tempIdMatrix(matrixIndex + j) = rate._2(matrixIndex + rate_index)
             tempScoreMatrix(matrixIndex + j) = rate._3(i, rate_index)
             rate_index += 1
-          } else if (rate._3(i, rate_index) < rateSum._3(i, sum_index)) {
+          } else {
             tempIdMatrix(matrixIndex + j) = rateSum._2(matrixIndex + sum_index)
             tempScoreMatrix(matrixIndex + j) = rateSum._3(i, sum_index)
             sum_index += 1
@@ -375,7 +375,7 @@ object MatrixFactorizationModel extends Loader[MatrixFactorizationModel] {
         }
         i += 1
       }
-      (rateSum._1, tempIdMatrix, new DenseMatrix(row, num, tempScoreMatrix))
+      (rateSum._1, tempIdMatrix, new DenseMatrix(row, num, tempScoreMatrix, true))
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ object MatrixFactorizationModel extends Loader[MatrixFactorizationModel] {`
`319`	`319`	`j += num`
`320`	`320`	`pq.clear()`
`321`	`321`	`}`
`322`		`- (index, (srcIds, dstIdMatrix, new DenseMatrix(m, num, scoreMatrix)))`
	`322`	`+ (index, (srcIds, dstIdMatrix, new DenseMatrix(m, num, scoreMatrix, true)))`
`323`	`323`	`}`
`324`	`324`	`ratings.aggregateByKey(null: Array[Int], null: Array[Int], null: DenseMatrix)(`
`325`	`325`	`(rateSum, rate) => mergeFunc(rateSum, rate, num),`
`@@ -366,7 +366,7 @@ object MatrixFactorizationModel extends Loader[MatrixFactorizationModel] {`
`366`	`366`	`tempIdMatrix(matrixIndex + j) = rate._2(matrixIndex + rate_index)`
`367`	`367`	`tempScoreMatrix(matrixIndex + j) = rate._3(i, rate_index)`
`368`	`368`	`rate_index += 1`
`369`		`- } else if (rate._3(i, rate_index) < rateSum._3(i, sum_index)) {`
	`369`	`+ } else {`
`370`	`370`	`tempIdMatrix(matrixIndex + j) = rateSum._2(matrixIndex + sum_index)`
`371`	`371`	`tempScoreMatrix(matrixIndex + j) = rateSum._3(i, sum_index)`
`372`	`372`	`sum_index += 1`
`@@ -375,7 +375,7 @@ object MatrixFactorizationModel extends Loader[MatrixFactorizationModel] {`
`375`	`375`	`}`
`376`	`376`	`i += 1`
`377`	`377`	`}`
`378`		`- (rateSum._1, tempIdMatrix, new DenseMatrix(row, num, tempScoreMatrix))`
	`378`	`+ (rateSum._1, tempIdMatrix, new DenseMatrix(row, num, tempScoreMatrix, true))`
`379`	`379`	`}`
`380`	`380`	`}`
`381`	`381`