Skip to content

filter -> collect simplification #293

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
danyaljj wants to merge 3 commits into
base: master
Choose a base branch
from
Open

filter -> collect simplification #293

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c60a4c
folterToCollect
Apr 30, 2016
0cc9db5
Merge branch 'master' into filterToCollect
May 4, 2016
464556a
Merge branch 'master' into filterToCollect
Jun 14, 2016
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
10 changes: 5 additions & 5 deletions saul-core/src/main/scala/edu/illinois/cs/cogcomp/saul/datamodel/node/Node.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ class Node[T <: AnyRef](

def filterNode(property: DiscreteProperty[T], value: String): Node[T] = {
val node = new Node[T](this.keyFunc, this.tag)
node populate collection.filter {
nt => property.sensor(nt.apply) == value
}.toSeq.map(_.apply)
node populate collection.collect {
case nt if property.sensor(nt.apply) == value => nt.apply
}
node
}

Expand Down Expand Up @@ -303,15 +303,15 @@ class JoinNode[A <: AnyRef, B <: AnyRef](val na: Node[A], val nb: Node[B], match

private def matchAndAddChildrenA(a: A, train: Boolean = true, populateEdge: Boolean = true): Unit = {
val instances = if (train) nb.getTrainingInstances else nb.getTestingInstances
for ((a, b) <- instances.filter(matcher(a, _)).map(a -> _)) {
for ((a, b) <- instances.collect { case b if matcher(a, b) => a -> b }) {
if (!contains(a -> b))
this addInstance (a -> b, train, populateEdge)
}
}

private def matchAndAddChildrenB(b: B, train: Boolean = true, populateEdge: Boolean = true): Unit = {
val instances = if (train) na.getTrainingInstances else na.getTestingInstances
for ((a, b) <- instances.filter(matcher(_, b)).map(_ -> b)) {
for ((a, b) <- instances.collect { case a if matcher(a, b) => a -> b }) {
if (!contains(a -> b))
this addInstance (a -> b, train, populateEdge)
}
Expand Down