Skip to content

chore: change connections count to long type #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore: change connections count to long type #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/main/scala/com/kwartile/lib/cc/ConnectedComponent.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ object ConnectedComponent extends Serializable {
* @param nodePairs on which to apply Small Star operations
* @return new nodePairs after the operation and conncectivy change count
*/
private def smallStar(nodePairs: RDD[(Long, Long)]): (RDD[(Long, Long)], Int) = {
private def smallStar(nodePairs: RDD[(Long, Long)]): (RDD[(Long, Long)], Long) = {

/**
* generate RDD of (self, List(neighbors)) where self > neighbors
Expand Down Expand Up @@ -99,7 +99,7 @@ object ConnectedComponent extends Serializable {
val (v, l) = iter.toSeq.unzip
val sum = l.foldLeft(0)(_ + _)
Iterator(sum)
}).sum.toInt
}).sum.toLong

val newNodePairs = newNodePairsWithChangeCount.map(x => x._1).flatMap(x => x)
newNodePairsWithChangeCount.unpersist(false)
Expand All @@ -111,7 +111,7 @@ object ConnectedComponent extends Serializable {
* @param nodePairs on which to apply Large Star operations
* @return new nodePairs after the operation and conncectivy change count
*/
private def largeStar(nodePairs: RDD[(Long, Long)]): (RDD[(Long, Long)], Int) = {
private def largeStar(nodePairs: RDD[(Long, Long)]): (RDD[(Long, Long)], Long) = {

/**
* generate RDD of (self, List(neighbors))
Expand Down Expand Up @@ -165,7 +165,7 @@ object ConnectedComponent extends Serializable {
val (v, l) = iter.toSeq.unzip
val sum = l.foldLeft(0)(_ + _)
Iterator(sum)
}).sum.toInt
}).sum.toLong

/**
* Sum all the changeCounts
Expand Down Expand Up @@ -229,7 +229,7 @@ object ConnectedComponent extends Serializable {

@tailrec
private def alternatingAlgo(nodePairs: RDD[(Long, Long)],
largeStarConnectivityChangeCount: Int, smallStarConnectivityChangeCount: Int, didConverge: Boolean,
largeStarConnectivityChangeCount: Long, smallStarConnectivityChangeCount: Long, didConverge: Boolean,
currIterationCount: Int, maxIterationCount: Int): (RDD[(Long, Long)], Boolean, Int) = {

val iterationCount = currIterationCount + 1
Expand Down Expand Up @@ -269,7 +269,7 @@ object ConnectedComponent extends Serializable {
buildPairs(aClique)
}).flatMap(x=>x)

val (cc, didConverge, iterCount) = alternatingAlgo(nodePairs, 9999999, 9999999, false, 0, maxIterationCount)
val (cc, didConverge, iterCount) = alternatingAlgo(nodePairs, 9999999L, 9999999L, false, 0, maxIterationCount)

if (didConverge) {
(cc, didConverge, iterCount)
Expand Down