Skip to content
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.

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

Laiacano/java extract subsettings #182

Merged
merged 4 commits into from
Jul 31, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
55 changes: 55 additions & 0 deletions java/src/main/java/com/spotify/featran/java/JFeatureSpec.java
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,61 @@ public JRecordExtractor<T, double[]> extractWithSettingsDouble(String settings)
return new JRecordExtractor<>(JavaOps.extractWithSettingsSparseLabeledPoint(self, settings));
}

/**
* Java wrapper for {@link FeatureSpec#extractWithSubsetSettings(String, FeatureBuilder, ClassTag)}.
*/
public JRecordExtractor<T, float[]> extractWithSubsetSettingsFloat(String settings) {
return new JRecordExtractor<>(JavaOps.extractWithSubsetSettingsFloat(self, settings));
}

/**
* Java wrapper for {@link FeatureSpec#extractWithSubsetSettings(String, FeatureBuilder, ClassTag)}.
*/
public JRecordExtractor<T, double[]> extractWithSubsetSettingsDouble(String settings) {
return new JRecordExtractor<>(JavaOps.extractWithSubsetSettingsDouble(self, settings));
}

/**
* Java wrapper for {@link FeatureSpec#extractWithSubsetSettings(String, FeatureBuilder, ClassTag)}.
*/
public JRecordExtractor<T, FloatSparseArray>
extractWithSubsetSettingsFloatSparseArray(String settings) {
return new JRecordExtractor<>(JavaOps.extractWithSubsetSettingsFloatSparseArray(self, settings));
}

/**
* Java wrapper for {@link FeatureSpec#extractWithSubsetSettings(String, FeatureBuilder, ClassTag).
*/
public JRecordExtractor<T, DoubleSparseArray>
extractWithSubsetSettingsDoubleSparseArray(String settings) {
return new JRecordExtractor<>(JavaOps.extractWithSubsetSettingsDoubleSparseArray(self, settings));
}

/**
* Java wrapper for {@link FeatureSpec#extractWithSubsetSettings(String, FeatureBuilder, ClassTag)}.
*/
public JRecordExtractor<T, FloatNamedSparseArray>
extractWithSubsetSettingsFloatNamedSparseArray(String settings) {
return new JRecordExtractor<>(JavaOps.extractWithSubsetSettingsFloatNamedSparseArray(self, settings));
}

/**
* Java wrapper for {@link FeatureSpec#extractWithSubsetSettings(String, FeatureBuilder, ClassTag).
*/
public JRecordExtractor<T, DoubleNamedSparseArray>
extractWithSubsetSettingsDoubleNamedSparseArray(String settings) {
return new JRecordExtractor<>(
JavaOps.extractWithSubsetSettingsDoubleNamedSparseArray(self, settings));
}

/**
* Java wrapper for {@link FeatureSpec#extractWithSubsetSettings(String, FeatureBuilder, ClassTag).
*/
public JRecordExtractor<T, Example>
extractWithSubsetSettingsExample(String settings) {
return new JRecordExtractor<>(JavaOps.extractWithSubsetSettingsExample(self, settings));
}

/**
* Returns internal {@link FeatureSpec}.
*/
Expand Down
32 changes: 32 additions & 0 deletions java/src/main/scala/com/spotify/featran/java/JavaOps.scala
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,38 @@ private object JavaOps {
override def pure[A, B: ClassTag](ma: JList[A])(b: B): JList[B] = Collections.singletonList(b)
}

def extractWithSubsetSettingsFloat[T](fs: FeatureSpec[T],
settings: String): RecordExtractor[T, Array[Float]] =
fs.extractWithSubsetSettings(settings)

def extractWithSubsetSettingsDouble[T](fs: FeatureSpec[T],
settings: String): RecordExtractor[T, Array[Double]] =
fs.extractWithSubsetSettings(settings)

def extractWithSubsetSettingsFloatSparseArray[T](
fs: FeatureSpec[T],
settings: String): RecordExtractor[T, FloatSparseArray] =
fs.extractWithSubsetSettings(settings)

def extractWithSubsetSettingsDoubleSparseArray[T](
fs: FeatureSpec[T],
settings: String): RecordExtractor[T, DoubleSparseArray] =
fs.extractWithSubsetSettings(settings)

def extractWithSubsetSettingsDoubleNamedSparseArray[T](
fs: FeatureSpec[T],
settings: String): RecordExtractor[T, DoubleNamedSparseArray] =
fs.extractWithSubsetSettings(settings)

def extractWithSubsetSettingsFloatNamedSparseArray[T](
fs: FeatureSpec[T],
settings: String): RecordExtractor[T, FloatNamedSparseArray] =
fs.extractWithSubsetSettings(settings)

def extractWithSubsetSettingsExample[T](fs: FeatureSpec[T],
settings: String): RecordExtractor[T, Example] =
fs.extractWithSubsetSettings(settings)

//================================================================================
// Wrappers for FeatureSpec
//================================================================================
Expand Down
37 changes: 37 additions & 0 deletions java/src/test/scala/com/spotify/featran/java/JavaTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,43 @@ class JavaTest extends FlatSpec with Matchers {
TestData.map(f9.featureValue).map(l2v(ExpectedNames.size)) shouldBe ExpectedValues
}

it should "work with extractWithSubsetSettings and RecordExtractor" in {
val ExpectedNamesSubset = Seq("one_hot_a")
val ExpectedValuesSubset = Seq(1.0, 0.0, 0.0, 0.0, 0.0, 0.00)

val TestSpecSubset = TestSpec.filter(feature => feature.transformer.name == "one_hot_a")

val fs = JFeatureSpec.wrap(TestSpecSubset)
val settings = fs.extract(TestData.asJava).featureSettings()
val f1 = fs.extractWithSubsetSettingsFloat(settings)
val f2 = fs.extractWithSubsetSettingsDouble(settings)
val f3 = fs.extractWithSubsetSettingsFloatSparseArray(settings)
val f4 = fs.extractWithSubsetSettingsDoubleSparseArray(settings)
val f5 = fs.extractWithSubsetSettingsFloatNamedSparseArray(settings)
val f6 = fs.extractWithSubsetSettingsDoubleNamedSparseArray(settings)
val f7 = fs.extractWithSubsetSettingsExample(settings)
val f8 = fs.extractWithSubsetSettingsLabeledPoint(settings)
val f9 = fs.extractWithSubsetSettingsSparseLabeledPoint(settings)
f1.featureNames().asScala shouldBe ExpectedNamesSubset
f2.featureNames().asScala shouldBe ExpectedNamesSubset
f3.featureNames().asScala shouldBe ExpectedNamesSubset
f4.featureNames().asScala shouldBe ExpectedNamesSubset
f5.featureNames().asScala shouldBe ExpectedNamesSubset
f6.featureNames().asScala shouldBe ExpectedNamesSubset
f7.featureNames().asScala shouldBe ExpectedNamesSubset
f8.featureNames().asScala shouldBe ExpectedNamesSubset
f9.featureNames().asScala shouldBe ExpectedNamesSubset
TestData.map(f1.featureValue).map(_.toSeq) shouldBe ExpectedValuesSubset
TestData.map(f2.featureValue).map(_.toSeq) shouldBe ExpectedValuesSubset
TestData.map(f3.featureValue).map(_.toDense.toSeq) shouldBe ExpectedValuesSubset
TestData.map(f4.featureValue).map(_.toDense.toSeq) shouldBe ExpectedValuesSubset
TestData.map(f5.featureValue).map(_.toDense.toSeq) shouldBe ExpectedValuesSubset
TestData.map(f6.featureValue).map(_.toDense.toSeq) shouldBe ExpectedValuesSubset
TestData.map(f7.featureValue).map(e2v(ExpectedNamesSubset)) shouldBe ExpectedValuesSubset
TestData.map(f8.featureValue).map(_.values.toSeq.map(_.toDouble)) shouldBe ExpectedValuesSubset
TestData.map(f9.featureValue).map(l2v(ExpectedNamesSubset.size)) shouldBe ExpectedValuesSubset
}

it should "work with sparse arrays" in {
val in = Seq("a", "b")
val indices = Seq(Seq(0), Seq(1))
Expand Down