Fix ResultProcessor bug, LogisticRegression bug and missing value conversion bug (#1236)

* Fix some bugs, add some unit tests.

* Fix LR stats bug

* Undo accidental TermTransform change

* Sweeper needs to load all components into ComponentCatalog

* Rename Mapping.de-de.txt

* Fix cat transform issue

* Compare pr baseline only on Windows

* Move baselines to Common folder

* Compare pr baseline only on Windows in another test

* Code review comment

* Fix ConcatTransform bug

* Add baselines for ConcatTransform bug

* Fix another bug in TermTransform

* NelderMead sweeper default value for FirstBatchSweeper arg

* Add some more unit tests

* Add more unit tests

* Fix unit test baseline, and baseline comparison with tolerance.

* Change back MatchWithTolerance method

* Fix bad merge

Author: yaeldMS

src/Microsoft.ML.Data/Data/Conversion.cs

@@ -1170,7 +1170,7 @@ private bool IsStdMissing(ref ReadOnlySpan<char> span)
         public bool TryParseKey(ref TX src, U8 min, U8 max, out U8 dst)
         {
             var span = src.Span;
-            Contracts.Check(!IsStdMissing(ref span), "Missing text value cannot be converted to unsigned integer type.");
+            Contracts.Check(span.IsEmpty || !IsStdMissing(ref span), "Missing text value cannot be converted to unsigned integer type.");
             Contracts.Assert(min <= max);
 
             // This simply ensures we don't have min == 0 and max == U8.MaxValue. This is illegal since
@@ -1530,7 +1530,7 @@ public bool TryParse(ref TX src, out BL dst)
         {
             var span = src.Span;
 
-            Contracts.Check(!IsStdMissing(ref span), "Missing text values cannot be converted to bool value.");
+            Contracts.Check(span.IsEmpty || !IsStdMissing(ref span), "Missing text value cannot be converted to bool type.");
 
             char ch;
             switch (src.Length)

src/Microsoft.ML.Data/Transforms/ConcatTransform.cs

@@ -384,7 +384,7 @@ public static IDataTransform Create(IHostEnvironment env, TaggedArguments args,
                 env.CheckUserArg(Utils.Size(args.Column[i].Source) > 0, nameof(args.Column));
 
             var cols = args.Column
-                .Select(c => new ColumnInfo(c.Name, c.Source.Select(kvp => (kvp.Value, kvp.Key))))
+                .Select(c => new ColumnInfo(c.Name, c.Source.Select(kvp => (kvp.Value, kvp.Key != "" ? kvp.Key : null))))
                 .ToArray();
             var transformer = new ConcatTransform(env, cols);
             return transformer.MakeDataTransform(input);

src/Microsoft.ML.Data/Transforms/TermEstimator.cs

@@ -21,6 +21,9 @@ public static class Defaults
 
         private readonly IHost _host;
         private readonly TermTransform.ColumnInfo[] _columns;
+        private readonly string _file;
+        private readonly string _termsColumn;
+        private readonly IComponentFactory<IMultiStreamSource, IDataLoader> _loaderFactory;
 
         /// <summary>
         /// Convenience constructor for public facing API.
@@ -32,18 +35,23 @@ public static class Defaults
         /// <param name="sort">How items should be ordered when vectorized. By default, they will be in the order encountered.
         /// If by value items are sorted according to their default comparison, for example, text sorting will be case sensitive (for example, 'A' then 'Z' then 'a').</param>
         public TermEstimator(IHostEnvironment env, string inputColumn, string outputColumn = null, int maxNumTerms = Defaults.MaxNumTerms, TermTransform.SortOrder sort = Defaults.Sort) :
-           this(env, new TermTransform.ColumnInfo(inputColumn, outputColumn ?? inputColumn, maxNumTerms, sort))
+           this(env, new[] { new TermTransform.ColumnInfo(inputColumn, outputColumn ?? inputColumn, maxNumTerms, sort) })
         {
         }
 
-        public TermEstimator(IHostEnvironment env, params TermTransform.ColumnInfo[] columns)
+        public TermEstimator(IHostEnvironment env, TermTransform.ColumnInfo[] columns,
+            string file = null, string termsColumn = null,
+            IComponentFactory<IMultiStreamSource, IDataLoader> loaderFactory = null)
         {
             Contracts.CheckValue(env, nameof(env));
             _host = env.Register(nameof(TermEstimator));
             _columns = columns;
+            _file = file;
+            _termsColumn = termsColumn;
+            _loaderFactory = loaderFactory;
         }
 
-        public TermTransform Fit(IDataView input) => new TermTransform(_host, input, _columns);
+        public TermTransform Fit(IDataView input) => new TermTransform(_host, input, _columns, _file, _termsColumn, _loaderFactory);
 
         public SchemaShape GetOutputSchema(SchemaShape inputSchema)
         {

src/Microsoft.ML.Data/Transforms/TermTransform.cs

@@ -268,7 +268,7 @@ public TermTransform(IHostEnvironment env, IDataView input,
             this(env, input, columns, null, null, null)
         { }
 
-        private TermTransform(IHostEnvironment env, IDataView input,
+        internal TermTransform(IHostEnvironment env, IDataView input,
             ColumnInfo[] columns,
             string file = null, string termsColumn = null,
             IComponentFactory<IMultiStreamSource, IDataLoader> loaderFactory = null)
@@ -314,13 +314,13 @@ public static IDataTransform Create(IHostEnvironment env, Arguments args, IDataV
                     if (!Enum.IsDefined(typeof(SortOrder), sortOrder))
                         throw env.ExceptUserArg(nameof(args.Sort), "Undefined sorting criteria '{0}' detected for column '{1}'", sortOrder, item.Name);
 
-                    cols[i] = new ColumnInfo(item.Source,
+                    cols[i] = new ColumnInfo(item.Source ?? item.Name,
                         item.Name,
                         item.MaxNumTerms ?? args.MaxNumTerms,
                         sortOrder,
                         item.Term,
                         item.TextKeyValues ?? args.TextKeyValues);
-                    cols[i].Terms = item.Terms;
+                    cols[i].Terms = item.Terms ?? args.Terms;
                 };
             }
             return new TermTransform(env, input, cols, args.DataFile, args.TermsColumn, args.Loader).MakeDataTransform(input);

src/Microsoft.ML.ResultProcessor/ResultProcessor.cs

@@ -1063,10 +1063,10 @@ private static Experiment CreateVisualizationExperiment(ExperimentItemResult res
             var experiment = new ML.Runtime.ExperimentVisualization.Experiment
             {
                 Key = index.ToString(),
-                CompareGroup = string.IsNullOrEmpty(result.CustomizedTag) ? result.Trainer.Kind : result.CustomizedTag,
+                CompareGroup = string.IsNullOrEmpty(result.CustomizedTag) ? result.TrainerKind : result.CustomizedTag,
                 Trainer = new ML.Runtime.ExperimentVisualization.Trainer
                 {
-                    Name = result.Trainer.Kind,
+                    Name = result.TrainerKind,
                     ParameterSets = new List<ML.Runtime.ExperimentVisualization.Item>()
                 },
                 DataSet = new ML.Runtime.ExperimentVisualization.DataSet { File = result.Datafile },
@@ -1152,7 +1152,10 @@ private static object Load(Stream stream)
 
         public static int Main(string[] args)
         {
-            return Main(new ConsoleEnvironment(42), args);
+            string currentDirectory = Path.GetDirectoryName(typeof(ResultProcessor).Module.FullyQualifiedName);
+            using (var env = new ConsoleEnvironment(42))
+            using (AssemblyLoadingUtils.CreateAssemblyRegistrar(env, currentDirectory))
+                return Main(env, args);
         }
 
         public static int Main(IHostEnvironment env, string[] args)

src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/LogisticRegression.cs

@@ -373,7 +373,7 @@ protected override ParameterMixingCalibratedPredictor CreatePredictor()
             CurrentWeights.GetItemOrDefault(0, ref bias);
             CurrentWeights.CopyTo(ref weights, 1, CurrentWeights.Length - 1);
             return new ParameterMixingCalibratedPredictor(Host,
-                new LinearBinaryPredictor(Host, ref weights, bias),
+                new LinearBinaryPredictor(Host, ref weights, bias, _stats),
                 new PlattCalibrator(Host, -1, 0));
         }
 

src/Microsoft.ML.Sweeper/Algorithms/NelderMead.cs

@@ -26,7 +26,7 @@ public sealed class Arguments
             public IComponentFactory<IValueGenerator>[] SweptParameters;
 
             [Argument(ArgumentType.LastOccurenceWins, HelpText = "The sweeper used to get the initial results.", ShortName = "init", SignatureType = typeof(SignatureSweeperFromParameterList))]
-            public IComponentFactory<IValueGenerator[], ISweeper> FirstBatchSweeper;
+            public IComponentFactory<IValueGenerator[], ISweeper> FirstBatchSweeper = ComponentFactoryUtils.CreateFromFunction<IValueGenerator[], ISweeper>((host, array) => new UniformRandomSweeper(host, new SweeperBase.ArgumentsBase(), array));
 
             [Argument(ArgumentType.AtMostOnce, HelpText = "Seed for the random number generator for the first batch sweeper", ShortName = "seed")]
             public int RandomSeed;

src/Microsoft.ML.Sweeper/ConfigRunner.cs

@@ -107,7 +107,10 @@ public virtual void Finish()
             if (Exe == null || Exe.EndsWith("maml", StringComparison.OrdinalIgnoreCase) ||
                 Exe.EndsWith("maml.exe", StringComparison.OrdinalIgnoreCase))
             {
+                string currentDirectory = Path.GetDirectoryName(typeof(ExeConfigRunnerBase).Module.FullyQualifiedName);
+
                 using (var ch = Host.Start("Finish"))
+                using (AssemblyLoadingUtils.CreateAssemblyRegistrar(Host, currentDirectory))
                 {
                     var runs = RunNums.ToArray();
                     var args = Utils.BuildArray(RunNums.Count + 2,
@@ -120,7 +123,7 @@ public virtual void Finish()
                             return string.Format("{{{0}}}", GetFilePath(runs[i], "out"));
                         });
 
-                    ResultProcessorInternal.ResultProcessor.Main (args);
+                    ResultProcessorInternal.ResultProcessor.Main(args);
 
                     ch.Info(@"The summary of the run results has been saved to the file {0}\{1}.summary.txt", OutputFolder, Prefix);
                 }

src/Microsoft.ML.Sweeper/Microsoft.ML.Sweeper.csproj

@@ -16,4 +16,8 @@
 
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\Common\AssemblyLoadingUtils.cs" Link="Common\AssemblyLoadingUtils.cs" />
+  </ItemGroup>
+
 </Project>

src/Microsoft.ML.Transforms/CategoricalTransform.cs

@@ -135,18 +135,20 @@ public static IDataTransform Create(IHostEnvironment env, Arguments args, IDataV
                     column.MaxNumTerms ?? args.MaxNumTerms,
                     column.Sort ?? args.Sort,
                     column.Term ?? args.Term);
-                col.SetTerms(column.Terms);
+                col.SetTerms(column.Terms ?? args.Terms);
                 columns.Add(col);
             }
-            return new CategoricalEstimator(env, columns.ToArray()).Fit(input).Transform(input) as IDataTransform;
+            return new CategoricalEstimator(env, columns.ToArray(), args.DataFile, args.TermsColumn, args.Loader).Fit(input).Transform(input) as IDataTransform;
         }
 
         private readonly TransformerChain<ITransformer> _transformer;
 
         public CategoricalTransform(TermEstimator term, IEstimator<ITransformer> toVector, IDataView input)
         {
-            var chain = term.Append(toVector);
-            _transformer = chain.Fit(input);
+            if (toVector != null)
+                _transformer = term.Append(toVector).Fit(input);
+            else
+                _transformer = new TransformerChain<ITransformer>(term.Fit(input));
         }
 
         public Schema GetOutputSchema(Schema inputSchema) => _transformer.GetOutputSchema(inputSchema);
@@ -198,15 +200,17 @@ internal void SetTerms(string terms)
         /// <param name="outputKind">The type of output expected.</param>
         public CategoricalEstimator(IHostEnvironment env, string input,
             string output = null, CategoricalTransform.OutputKind outputKind = Defaults.OutKind)
-            : this(env, new ColumnInfo(input, output ?? input, outputKind))
+            : this(env, new[] { new ColumnInfo(input, output ?? input, outputKind) })
         {
         }
 
-        public CategoricalEstimator(IHostEnvironment env, params ColumnInfo[] columns)
+        public CategoricalEstimator(IHostEnvironment env, ColumnInfo[] columns,
+            string file = null, string termsColumn = null,
+            IComponentFactory<IMultiStreamSource, IDataLoader> loaderFactory = null)
         {
             Contracts.CheckValue(env, nameof(env));
             _host = env.Register(nameof(TermEstimator));
-            _term = new TermEstimator(_host, columns);
+            _term = new TermEstimator(_host, columns, file, termsColumn, loaderFactory);
             var binaryCols = new List<(string input, string output)>();
             var cols = new List<(string input, string output, bool bag)>();
             for (int i = 0; i < columns.Length; i++)