fixed some rebase errors

Author: michaelgsharp

Microsoft.ML.sln

@@ -284,14 +284,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.AutoMLFeaturiz
 pkg\Microsoft.ML.AutoMLFeaturizers\Microsoft.ML.AutoMLFeaturizers.symbols.nupkgproj = pkg\Microsoft.ML.AutoMLFeaturizers\Microsoft.ML.AutoMLFeaturizers.symbols.nupkgproj
 EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.AutoMLFeaturizers", "src\Microsoft.ML.AutoMLFeaturizers\Microsoft.ML.AutoMLFeaturizers.csproj", "{E2DD0721-5B0F-4606-8182-4C7EFB834518}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.AutoMLFeaturizers", "Microsoft.ML.AutoMLFeaturizers", "{1BA5C784-52E8-4A87-8525-26B2452F2882}"
-ProjectSection(SolutionItems) = preProject
-pkg\Microsoft.ML.AutoMLFeaturizers\Microsoft.ML.AutoMLFeaturizers.nupkgproj = pkg\Microsoft.ML.AutoMLFeaturizers\Microsoft.ML.AutoMLFeaturizers.nupkgproj
-pkg\Microsoft.ML.AutoMLFeaturizers\Microsoft.ML.AutoMLFeaturizers.symbols.nupkgproj = pkg\Microsoft.ML.AutoMLFeaturizers\Microsoft.ML.AutoMLFeaturizers.symbols.nupkgproj
-EndProjectSection
-EndProject
 Global
 GlobalSection(SolutionConfigurationPlatforms) = preSolution
 Debug|Any CPU = Debug|Any CPU

src/Microsoft.ML.AutoMLFeaturizers/Common.cs

@@ -13,7 +13,7 @@ namespace Microsoft.ML.AutoMLFeaturizers
 
  internal enum FitResult : byte
  {
- Complete = 1, Continue, ResetAndContinue
+ Complete, Continue, ResetAndContinue
  }
 
  internal enum TypeId : byte

test/Microsoft.ML.Tests/Transformers/ToStringTransformerTests.cs

@@ -348,34 +348,5 @@ public void TestEntryPoint()
  Assert.Equal("Long Dummy String Value", rows[1].Values[1].Value.ToString());
  Done();
  }
- 
- [Fact]
- public void TestEntryPoint()
- {
- MLContext mlContext = new MLContext(1);
-
- var data = new[] { new StringInput() { data = ""}, new StringInput() { data = "Long Dummy String Value" } };
- IDataView input = mlContext.Data.LoadFromEnumerable(data);
-
- var options = new ToStringTransformerEstimator.Options()
- {
- Columns = new ToStringTransformerEstimator.Column[1]
- {
- new ToStringTransformerEstimator.Column()
- {
- Name = "data"
- }
- },
- Data = input
- };
-
- var output = ToStringTransformerEntrypoint.ToString(mlContext.Transforms.GetEnvironment(), options);
-
- var rows = output.OutputData.Preview().RowView;
-
- Assert.Equal("", rows[0].Values[1].Value.ToString());
- Assert.Equal("Long Dummy String Value", rows[1].Values[1].Value.ToString());
- Done();
- }
  }
 }