From 6d94a131cae1d2a8f5b3f1a0ef9183b87d454884 Mon Sep 17 00:00:00 2001 From: Abiyaz Date: Thu, 13 Jul 2017 10:39:46 -0500 Subject: [PATCH] fixed formatting error --- .../cs/cogcomp/saul/datamodel/DataModel.scala | 12 ++++++------ .../CircumplexSentimentAnalysis/CircumplexApp.scala | 5 ++--- .../circumplexClassifiers.scala | 3 +-- .../circumplexDataModel.scala | 7 +++---- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/saul-core/src/main/scala/edu/illinois/cs/cogcomp/saul/datamodel/DataModel.scala b/saul-core/src/main/scala/edu/illinois/cs/cogcomp/saul/datamodel/DataModel.scala index d7bcde79..3d8355a4 100644 --- a/saul-core/src/main/scala/edu/illinois/cs/cogcomp/saul/datamodel/DataModel.scala +++ b/saul-core/src/main/scala/edu/illinois/cs/cogcomp/saul/datamodel/DataModel.scala @@ -211,7 +211,7 @@ trait DataModel extends Logging { /** Discrete sensor feature with range, same as real% and real[] in lbjava */ def apply(f: T => List[Double])(implicit tag: ClassTag[T], d1: DummyImplicit, d2: DummyImplicit, - d3: DummyImplicit): RealCollectionProperty[T] = { + d3: DummyImplicit): RealCollectionProperty[T] = { def cachedF = if (cache) { x: T => getOrUpdate(x, f).asInstanceOf[List[Double]] } else f val a = new RealCollectionProperty[T](name, cachedF, ordered) with NodeProperty[T] { override def node: Node[T] = papply.node @@ -223,7 +223,7 @@ trait DataModel extends Logging { /** Discrete sensor feature with range, same as real name in lbjava */ def apply(f: T => Double)(implicit tag: ClassTag[T], d1: DummyImplicit, d2: DummyImplicit, d3: DummyImplicit, - d4: DummyImplicit): RealProperty[T] = { + d4: DummyImplicit): RealProperty[T] = { def cachedF = if (cache) { x: T => getOrUpdate(x, f).asInstanceOf[Double] } else f val a = new RealProperty[T](name, cachedF) with NodeProperty[T] { override def node: Node[T] = papply.node @@ -235,7 +235,7 @@ trait DataModel extends Logging { /** Discrete feature without range, same as discrete SpamLabel in lbjava */ def apply(f: T => String)(implicit tag: ClassTag[T], d1: DummyImplicit, d2: DummyImplicit, d3: DummyImplicit, - d4: DummyImplicit, d5: DummyImplicit): DiscreteProperty[T] = { + d4: DummyImplicit, d5: DummyImplicit): DiscreteProperty[T] = { def cachedF = if (cache) { x: T => getOrUpdate(x, f).asInstanceOf[String] } else f val a = new DiscreteProperty[T](name, cachedF, None) with NodeProperty[T] { override def node: Node[T] = papply.node @@ -247,7 +247,7 @@ trait DataModel extends Logging { /** Discrete array feature with range, same as discrete[] and discrete% in lbjava */ def apply(f: T => List[String])(implicit tag: ClassTag[T], d1: DummyImplicit, d2: DummyImplicit, d3: DummyImplicit, - d4: DummyImplicit, d5: DummyImplicit, d6: DummyImplicit): DiscreteCollectionProperty[T] = { + d4: DummyImplicit, d5: DummyImplicit, d6: DummyImplicit): DiscreteCollectionProperty[T] = { def cachedF = if (cache) { x: T => getOrUpdate(x, f).asInstanceOf[List[String]] } else f val a = new DiscreteCollectionProperty[T](name, cachedF, !ordered) with NodeProperty[T] { override def node: Node[T] = papply.node @@ -259,8 +259,8 @@ trait DataModel extends Logging { /** Discrete feature with range, same as discrete{"spam", "ham"} SpamLabel in lbjava */ def apply(range: String*)(f: T => String)(implicit tag: ClassTag[T], d1: DummyImplicit, d2: DummyImplicit, d3: DummyImplicit, - d4: DummyImplicit, d5: DummyImplicit, d6: DummyImplicit, - d7: DummyImplicit): DiscreteProperty[T] = { + d4: DummyImplicit, d5: DummyImplicit, d6: DummyImplicit, + d7: DummyImplicit): DiscreteProperty[T] = { def cachedF = if (cache) { x: T => getOrUpdate(x, f).asInstanceOf[String] } else f val r = range.toList val a = new DiscreteProperty[T](name, cachedF, Some(r)) with NodeProperty[T] { diff --git a/saul-examples/src/main/scala/edu/illinois/cs/cogcomp/saulexamples/nlp/CircumplexSentimentAnalysis/CircumplexApp.scala b/saul-examples/src/main/scala/edu/illinois/cs/cogcomp/saulexamples/nlp/CircumplexSentimentAnalysis/CircumplexApp.scala index f826f3e2..af79369d 100644 --- a/saul-examples/src/main/scala/edu/illinois/cs/cogcomp/saulexamples/nlp/CircumplexSentimentAnalysis/CircumplexApp.scala +++ b/saul-examples/src/main/scala/edu/illinois/cs/cogcomp/saulexamples/nlp/CircumplexSentimentAnalysis/CircumplexApp.scala @@ -8,13 +8,12 @@ import edu.illinois.cs.cogcomp.saulexamples.circumplex.facebook.CircumplexReader import scala.collection.JavaConversions._ - object CircumplexApp extends App { val Reader = new CircumplexReader("./data/circumplex/dataset-fb-valence-arousal-anon.csv.gz") - circumplex_post.populate(Reader.posts.toList.slice(0,Reader.posts.toList.size()-100)); - circumplex_post.populate(Reader.posts.toList.slice(Reader.posts.toList.size()-100,Reader.posts.toList.size()), train = false) + circumplex_post.populate(Reader.posts.toList.slice(0, Reader.posts.toList.size() - 100)); + circumplex_post.populate(Reader.posts.toList.slice(Reader.posts.toList.size() - 100, Reader.posts.toList.size()), train = false) sentimentClassifier.learn(10) sentimentClassifier.testContinuous(); sentimentClassifier.save() diff --git a/saul-examples/src/main/scala/edu/illinois/cs/cogcomp/saulexamples/nlp/CircumplexSentimentAnalysis/circumplexClassifiers.scala b/saul-examples/src/main/scala/edu/illinois/cs/cogcomp/saulexamples/nlp/CircumplexSentimentAnalysis/circumplexClassifiers.scala index ee232912..64cea166 100644 --- a/saul-examples/src/main/scala/edu/illinois/cs/cogcomp/saulexamples/nlp/CircumplexSentimentAnalysis/circumplexClassifiers.scala +++ b/saul-examples/src/main/scala/edu/illinois/cs/cogcomp/saulexamples/nlp/CircumplexSentimentAnalysis/circumplexClassifiers.scala @@ -5,8 +5,7 @@ import edu.illinois.cs.cogcomp.saul.learn.MultilayerPerceptron import edu.illinois.cs.cogcomp.saulexamples.circumplex.datastructures.Circumplex_Post import circumplexDataModel._ -/** - * Created by Abiyaz on 7/7/2017. +/** Created by Abiyaz on 7/7/2017. */ object circumplexClassifiers { object sentimentClassifier extends Learnable[Circumplex_Post](circumplex_post) { diff --git a/saul-examples/src/main/scala/edu/illinois/cs/cogcomp/saulexamples/nlp/CircumplexSentimentAnalysis/circumplexDataModel.scala b/saul-examples/src/main/scala/edu/illinois/cs/cogcomp/saulexamples/nlp/CircumplexSentimentAnalysis/circumplexDataModel.scala index 0d5d64f4..67c7f7ad 100644 --- a/saul-examples/src/main/scala/edu/illinois/cs/cogcomp/saulexamples/nlp/CircumplexSentimentAnalysis/circumplexDataModel.scala +++ b/saul-examples/src/main/scala/edu/illinois/cs/cogcomp/saulexamples/nlp/CircumplexSentimentAnalysis/circumplexDataModel.scala @@ -4,10 +4,9 @@ import edu.illinois.cs.cogcomp.saul.datamodel.DataModel import edu.illinois.cs.cogcomp.saulexamples.circumplex.datastructures.Circumplex_Post import scala.collection.JavaConversions._ -/** - * Created by Abiyaz on 7/7/2017. +/** Created by Abiyaz on 7/7/2017. */ -object circumplexDataModel extends DataModel{ +object circumplexDataModel extends DataModel { val circumplex_post = node[Circumplex_Post] val WordFeatures = property(circumplex_post) { @@ -33,6 +32,6 @@ object circumplexDataModel extends DataModel{ }*/ var Label = property(circumplex_post) { - x: Circumplex_Post => x.getValence :: x.getArousal :: Nil; + x: Circumplex_Post => x.getValence :: x.getArousal :: Nil; } }