Resolved merged conflicts.

zeahmed · zeahmed · commit d3e28412aee7 · 2019-03-11T13:00:33.000-07:00
diff --git a/test/Microsoft.ML.Functional.Tests/DataTransformation.cs b/test/Microsoft.ML.Functional.Tests/DataTransformation.cs
@@ -141,7 +141,7 @@ void ExtensibilityModifyTextFeaturization()
                     {
                         CharFeatureExtractor = new WordBagEstimator.Options() { NgramLength = 3, AllLengths = false },
                         WordFeatureExtractor = new WordBagEstimator.Options(),
-                        VectorNormalizer = TextFeaturizingEstimator.TextNormKind.L1
+                        VectorNormalizer = TextFeaturizingEstimator.NormFunction.L1
                     }, "SentimentText")
                 .AppendCacheCheckpoint(mlContext)
                 .Append(mlContext.BinaryClassification.Trainers.StochasticDualCoordinateAscent(

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ void ExtensibilityModifyTextFeaturization()`
`141`	`141`	`{`
`142`	`142`	`CharFeatureExtractor = new WordBagEstimator.Options() { NgramLength = 3, AllLengths = false },`
`143`	`143`	`WordFeatureExtractor = new WordBagEstimator.Options(),`
`144`		`- VectorNormalizer = TextFeaturizingEstimator.TextNormKind.L1`
	`144`	`+ VectorNormalizer = TextFeaturizingEstimator.NormFunction.L1`
`145`	`145`	`}, "SentimentText")`
`146`	`146`	`.AppendCacheCheckpoint(mlContext)`
`147`	`147`	`.Append(mlContext.BinaryClassification.Trainers.StochasticDualCoordinateAscent(`