From f3f1fd2dcd413c7fc79f5a42849701d54b44724b Mon Sep 17 00:00:00 2001 From: Chris Rupley Date: Mon, 15 Apr 2019 16:01:01 -0700 Subject: [PATCH 1/6] match up names for OpLDA and test --- .../scala/com/salesforce/op/stages/impl/feature/OpLdaTest.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/test/scala/com/salesforce/op/stages/impl/feature/OpLdaTest.scala b/core/src/test/scala/com/salesforce/op/stages/impl/feature/OpLdaTest.scala index 903b98aadf..a1ccd078de 100644 --- a/core/src/test/scala/com/salesforce/op/stages/impl/feature/OpLdaTest.scala +++ b/core/src/test/scala/com/salesforce/op/stages/impl/feature/OpLdaTest.scala @@ -42,7 +42,7 @@ import org.scalatest.{Assertions, FlatSpec, Matchers} @RunWith(classOf[JUnitRunner]) -class OpLdaTest extends FlatSpec with TestSparkContext { +class OpLDATest extends FlatSpec with TestSparkContext { val inputData = Seq( (0.0, Vectors.sparse(11, Array(0, 1, 2, 4, 5, 6, 7, 10), Array(1.0, 2.0, 6.0, 2.0, 3.0, 1.0, 1.0, 3.0))), From 1bf74c08e84a65998583722ddb87d45dff1b1338 Mon Sep 17 00:00:00 2001 From: Chris Rupley Date: Mon, 15 Apr 2019 16:02:12 -0700 Subject: [PATCH 2/6] rename OpLDATest everywhere --- .../op/stages/impl/feature/{OpLdaTest.scala => OpLDATest.scala} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename core/src/test/scala/com/salesforce/op/stages/impl/feature/{OpLdaTest.scala => OpLDATest.scala} (98%) diff --git a/core/src/test/scala/com/salesforce/op/stages/impl/feature/OpLdaTest.scala b/core/src/test/scala/com/salesforce/op/stages/impl/feature/OpLDATest.scala similarity index 98% rename from core/src/test/scala/com/salesforce/op/stages/impl/feature/OpLdaTest.scala rename to core/src/test/scala/com/salesforce/op/stages/impl/feature/OpLDATest.scala index a1ccd078de..df35c4192e 100644 --- a/core/src/test/scala/com/salesforce/op/stages/impl/feature/OpLdaTest.scala +++ b/core/src/test/scala/com/salesforce/op/stages/impl/feature/OpLDATest.scala @@ -78,7 +78,7 @@ class OpLDATest extends FlatSpec with TestSparkContext { .toSeq .map(_.getAs[Vector](0)) - Spec[OpLdaTest] should "convert document term vectors into topic vectors" in { + Spec[OpLDATest] should "convert document term vectors into topic vectors" in { val f2Vec = new OpLDA().setInput(f2).setK(k).setSeed(seed).setMaxIter(maxIter) val testTransformedData = f2Vec.fit(inputDS).transform(inputDS) val output = f2Vec.getOutput() From 9a5953a83977e8bd3a692d3a966d9f17691b08d5 Mon Sep 17 00:00:00 2001 From: Chris Rupley Date: Mon, 15 Apr 2019 16:05:09 -0700 Subject: [PATCH 3/6] rename StandardScalar test to match --- ...tandardScalerTest.scala => OpScalarStandardScalerTest.scala} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename core/src/test/scala/com/salesforce/op/stages/impl/feature/{OpStandardScalerTest.scala => OpScalarStandardScalerTest.scala} (99%) diff --git a/core/src/test/scala/com/salesforce/op/stages/impl/feature/OpStandardScalerTest.scala b/core/src/test/scala/com/salesforce/op/stages/impl/feature/OpScalarStandardScalerTest.scala similarity index 99% rename from core/src/test/scala/com/salesforce/op/stages/impl/feature/OpStandardScalerTest.scala rename to core/src/test/scala/com/salesforce/op/stages/impl/feature/OpScalarStandardScalerTest.scala index 583556699c..a74ba04443 100644 --- a/core/src/test/scala/com/salesforce/op/stages/impl/feature/OpStandardScalerTest.scala +++ b/core/src/test/scala/com/salesforce/op/stages/impl/feature/OpScalarStandardScalerTest.scala @@ -45,7 +45,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) -class OpStandardScalerTest extends FlatSpec with TestSparkContext { +class OpScalarStandardScalerTest extends FlatSpec with TestSparkContext { import spark.implicits._ // TODO: use TestFeatureBuilder instead From 26058eebb04dae9b7021c7a6028d8e0cb8836140 Mon Sep 17 00:00:00 2001 From: Chris Rupley Date: Mon, 15 Apr 2019 16:07:14 -0700 Subject: [PATCH 4/6] rename TextMapPivotVectorizer test to match --- ...pVectorizerTest.scala => TextMapPivotVectorizerTest.scala} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename core/src/test/scala/com/salesforce/op/stages/impl/feature/{TextMapVectorizerTest.scala => TextMapPivotVectorizerTest.scala} (99%) diff --git a/core/src/test/scala/com/salesforce/op/stages/impl/feature/TextMapVectorizerTest.scala b/core/src/test/scala/com/salesforce/op/stages/impl/feature/TextMapPivotVectorizerTest.scala similarity index 99% rename from core/src/test/scala/com/salesforce/op/stages/impl/feature/TextMapVectorizerTest.scala rename to core/src/test/scala/com/salesforce/op/stages/impl/feature/TextMapPivotVectorizerTest.scala index fb388f9e9c..42f8c1203a 100644 --- a/core/src/test/scala/com/salesforce/op/stages/impl/feature/TextMapVectorizerTest.scala +++ b/core/src/test/scala/com/salesforce/op/stages/impl/feature/TextMapPivotVectorizerTest.scala @@ -44,9 +44,9 @@ import org.slf4j.LoggerFactory @RunWith(classOf[JUnitRunner]) -class TextMapVectorizerTest extends FlatSpec with TestSparkContext with AttributeAsserts { +class TextMapPivotVectorizerTest extends FlatSpec with TestSparkContext with AttributeAsserts { - val log = LoggerFactory.getLogger(classOf[TextMapVectorizerTest]) + val log = LoggerFactory.getLogger(classOf[TextMapPivotVectorizerTest]) lazy val (dataSet, top, bot) = TestFeatureBuilder("top", "bot", Seq( From ddc8de1441bcf1bd716223f13ab8f3f79fb30076 Mon Sep 17 00:00:00 2001 From: Chris Rupley Date: Mon, 15 Apr 2019 16:09:48 -0700 Subject: [PATCH 5/6] rename Transmogrifier test to match --- .../{TransmogrifyTest.scala => TransmogrifierTest.scala} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename core/src/test/scala/com/salesforce/op/stages/impl/feature/{TransmogrifyTest.scala => TransmogrifierTest.scala} (97%) diff --git a/core/src/test/scala/com/salesforce/op/stages/impl/feature/TransmogrifyTest.scala b/core/src/test/scala/com/salesforce/op/stages/impl/feature/TransmogrifierTest.scala similarity index 97% rename from core/src/test/scala/com/salesforce/op/stages/impl/feature/TransmogrifyTest.scala rename to core/src/test/scala/com/salesforce/op/stages/impl/feature/TransmogrifierTest.scala index dd00952311..54df05a7b5 100644 --- a/core/src/test/scala/com/salesforce/op/stages/impl/feature/TransmogrifyTest.scala +++ b/core/src/test/scala/com/salesforce/op/stages/impl/feature/TransmogrifierTest.scala @@ -42,7 +42,7 @@ import org.scalatest.FlatSpec import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) -class TransmogrifyTest extends FlatSpec with PassengerSparkFixtureTest with AttributeAsserts { +class TransmogrifierTest extends FlatSpec with PassengerSparkFixtureTest with AttributeAsserts { val inputFeatures = Array[OPFeature](heightNoWindow, weight, gender) From 41c513f4f5375ee59693c04b35366fd36fd64148 Mon Sep 17 00:00:00 2001 From: Chris Rupley Date: Mon, 15 Apr 2019 17:08:23 -0700 Subject: [PATCH 6/6] test for OpLDA not OpLDATest --- .../scala/com/salesforce/op/stages/impl/feature/OpLDATest.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/test/scala/com/salesforce/op/stages/impl/feature/OpLDATest.scala b/core/src/test/scala/com/salesforce/op/stages/impl/feature/OpLDATest.scala index df35c4192e..091bd316ab 100644 --- a/core/src/test/scala/com/salesforce/op/stages/impl/feature/OpLDATest.scala +++ b/core/src/test/scala/com/salesforce/op/stages/impl/feature/OpLDATest.scala @@ -78,7 +78,7 @@ class OpLDATest extends FlatSpec with TestSparkContext { .toSeq .map(_.getAs[Vector](0)) - Spec[OpLDATest] should "convert document term vectors into topic vectors" in { + Spec[OpLDA] should "convert document term vectors into topic vectors" in { val f2Vec = new OpLDA().setInput(f2).setK(k).setSeed(seed).setMaxIter(maxIter) val testTransformedData = f2Vec.fit(inputDS).transform(inputDS) val output = f2Vec.getOutput()