Merge branch 'master' into smoke-test

dotnet/xml/Microsoft.ML.Data/DatabaseLoader+Column.xml

@@ -199,7 +199,11 @@
  <MemberSignature Language="DocId" Value="F:Microsoft.ML.Data.DatabaseLoader.Column.Source" />
  <MemberSignature Language="VB.NET" Value="Public Source As DatabaseLoader.Range() " FrameworkAlternate="ml-dotnet;ml-dotnet-1.4.0" />
  <MemberSignature Language="F#" Value="val mutable Source : Microsoft.ML.Data.DatabaseLoader.Range[]" Usage="Microsoft.ML.Data.DatabaseLoader.Column.Source" FrameworkAlternate="ml-dotnet;ml-dotnet-1.4.0" />
+<<<<<<< HEAD
  <MemberSignature Language="C#" Value="public int? Source;" FrameworkAlternate="ml-dotnet-preview-0.15.1" />
+=======
+ <MemberSignature Language="C#" Value="public Nullable&lt;int&gt; Source;" FrameworkAlternate="ml-dotnet-preview-0.15.1" />
+>>>>>>> master
  <MemberSignature Language="ILAsm" Value=".field public valuetype System.Nullable`1&lt;int32&gt; Source" FrameworkAlternate="ml-dotnet-preview-0.15.1" />
  <MemberSignature Language="VB.NET" Value="Public Source As Nullable(Of Integer) " FrameworkAlternate="ml-dotnet-preview-0.15.1" />
  <MemberSignature Language="F#" Value="val mutable Source : Nullable&lt;int&gt;" Usage="Microsoft.ML.Data.DatabaseLoader.Column.Source" FrameworkAlternate="ml-dotnet-preview-0.15.1" />

dotnet/xml/Microsoft.ML.Data/RankingMetrics.xml

@@ -67,6 +67,7 @@
  </ReturnValue>
  <Docs>
  <summary>
+<<<<<<< HEAD
  <format type="text/markdown"><![CDATA[
  List of normalized discounted cumulative gains (NDCG), where the N-th element represents NDCG@N.
  Search resuls vary in length depending on query, so different rankers cannot be consistently compared
@@ -76,6 +77,10 @@
  $NDCG@N = \frac{DCG@N}{MaxDCG@N}$
  ]]></format>
  </summary>
+=======
+ Array of normalized discounted cumulative gains where i-th element represent NDCG@i.
+ <image src="https://github.com/dotnet/machinelearning/blob/3cdd3c8b32705e91dcf46c429ee34196163af6da/docs/images/NDCG.png?raw=true" /></summary>
+>>>>>>> master
  <value>To be added.</value>
  <remarks>
  <a href="https://en.wikipedia.org/wiki/Discounted_cumulative_gain#Normalized_DCG">Normalized Discounted Cumulative Gain</a>

dotnet/xml/Microsoft.ML.Data/SvmLightLoaderSaverCatalog.xml

@@ -90,6 +90,9 @@
  </Member>
  <Member MemberName="LoadFromSvmLightFile">
  <MemberSignature Language="C#" Value="public static Microsoft.ML.IDataView LoadFromSvmLightFile (this Microsoft.ML.DataOperationsCatalog catalog, string path, long? numberOfRows = default, int inputSize = 0, bool zeroBased = false);" />
+=======
+ <MemberSignature Language="C#" Value="public static Microsoft.ML.IDataView LoadFromSvmLightFile (this Microsoft.ML.DataOperationsCatalog catalog, string path, Nullable&lt;long&gt; numberOfRows = null, int inputSize = 0, bool zeroBased = false);" />
+>>>>>>> master
  <MemberSignature Language="ILAsm" Value=".method public static hidebysig class Microsoft.ML.IDataView LoadFromSvmLightFile(class Microsoft.ML.DataOperationsCatalog catalog, string path, valuetype System.Nullable`1&lt;int64&gt; numberOfRows, int32 inputSize, bool zeroBased) cil managed" />
  <MemberSignature Language="DocId" Value="M:Microsoft.ML.Data.SvmLightLoaderSaverCatalog.LoadFromSvmLightFile(Microsoft.ML.DataOperationsCatalog,System.String,System.Nullable{System.Int64},System.Int32,System.Boolean)" />
  <MemberSignature Language="VB.NET" Value="&lt;Extension()&gt;&#xA;Public Function LoadFromSvmLightFile (catalog As DataOperationsCatalog, path As String, Optional numberOfRows As Nullable(Of Long) = null, Optional inputSize As Integer = 0, Optional zeroBased As Boolean = false) As IDataView" />
@@ -115,7 +118,7 @@
  <param name="inputSize">The number of features in the Features column. If 0 is specified, the
  loader will determine it by looking at the file given in <paramref name="path" />.</param>
  <param name="zeroBased">If the file contains zero-based indices, this parameter should be set to true. If they are one-based
- it should be set to false.</param>
+ it should be set to false.</param><<<<<<< HEAD
  <param name="numberOfRows">The number of rows from the sample to be used for determining the number of features.</param>
  <summary>
  Load a <see cref="T:Microsoft.ML.IDataView" /> from a text file using <see cref="T:Microsoft.ML.Data.SvmLightLoader" />.

dotnet/xml/Microsoft.ML.Trainers/MatrixFactorizationTrainer.xml

@@ -1,4 +1,5 @@
 <Type Name="MatrixFactorizationTrainer" FullName="Microsoft.ML.Trainers.MatrixFactorizationTrainer">
+<<<<<<< HEAD
  <TypeSignature Language="C#" Value="public sealed class MatrixFactorizationTrainer : Microsoft.ML.IEstimator&lt;Microsoft.ML.Trainers.Recommender.MatrixFactorizationPredictionTransformer&gt;, Microsoft.ML.Trainers.ITrainerEstimator&lt;Microsoft.ML.Trainers.Recommender.MatrixFactorizationPredictionTransformer,Microsoft.ML.Trainers.Recommender.MatrixFactorizationModelParameters&gt;" FrameworkAlternate="ml-dotnet-preview;ml-dotnet-preview-0.16.0" />
  <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed beforefieldinit MatrixFactorizationTrainer extends System.Object implements class Microsoft.ML.IEstimator`1&lt;class Microsoft.ML.Trainers.Recommender.MatrixFactorizationPredictionTransformer&gt;, class Microsoft.ML.Trainers.ITrainerEstimator`2&lt;class Microsoft.ML.Trainers.Recommender.MatrixFactorizationPredictionTransformer, class Microsoft.ML.Trainers.Recommender.MatrixFactorizationModelParameters&gt;" FrameworkAlternate="ml-dotnet-preview;ml-dotnet-preview-0.16.0" />
  <TypeSignature Language="DocId" Value="T:Microsoft.ML.Trainers.MatrixFactorizationTrainer" />
@@ -8,6 +9,13 @@
  <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed beforefieldinit MatrixFactorizationTrainer extends System.Object implements class Microsoft.ML.IEstimator`1&lt;class Microsoft.ML.Trainers.Recommender.MatrixFactorizationPredictionTransformer&gt;" FrameworkAlternate="ml-dotnet-preview-0.12.0;ml-dotnet-preview-0.13.0;ml-dotnet-preview-0.14.0;ml-dotnet-preview-0.15.1" />
  <TypeSignature Language="VB.NET" Value="Public NotInheritable Class MatrixFactorizationTrainer&#xA;Implements IEstimator(Of MatrixFactorizationPredictionTransformer)" FrameworkAlternate="ml-dotnet-preview-0.12.0;ml-dotnet-preview-0.13.0;ml-dotnet-preview-0.14.0;ml-dotnet-preview-0.15.1" />
  <TypeSignature Language="F#" Value="type MatrixFactorizationTrainer = class&#xA; interface IEstimator&lt;MatrixFactorizationPredictionTransformer&gt;" FrameworkAlternate="ml-dotnet-preview-0.12.0;ml-dotnet-preview-0.13.0;ml-dotnet-preview-0.14.0;ml-dotnet-preview-0.15.1" />
+=======
+ <TypeSignature Language="C#" Value="public sealed class MatrixFactorizationTrainer : Microsoft.ML.IEstimator&lt;Microsoft.ML.Trainers.Recommender.MatrixFactorizationPredictionTransformer&gt;, Microsoft.ML.Trainers.ITrainerEstimator&lt;Microsoft.ML.Trainers.Recommender.MatrixFactorizationPredictionTransformer,Microsoft.ML.Trainers.Recommender.MatrixFactorizationModelParameters&gt;" />
+ <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed beforefieldinit MatrixFactorizationTrainer extends System.Object implements class Microsoft.ML.IEstimator`1&lt;class Microsoft.ML.Trainers.Recommender.MatrixFactorizationPredictionTransformer&gt;, class Microsoft.ML.Trainers.ITrainerEstimator`2&lt;class Microsoft.ML.Trainers.Recommender.MatrixFactorizationPredictionTransformer, class Microsoft.ML.Trainers.Recommender.MatrixFactorizationModelParameters&gt;" />
+ <TypeSignature Language="DocId" Value="T:Microsoft.ML.Trainers.MatrixFactorizationTrainer" />
+ <TypeSignature Language="VB.NET" Value="Public NotInheritable Class MatrixFactorizationTrainer&#xA;Implements IEstimator(Of MatrixFactorizationPredictionTransformer), ITrainerEstimator(Of MatrixFactorizationPredictionTransformer, MatrixFactorizationModelParameters)" />
+ <TypeSignature Language="F#" Value="type MatrixFactorizationTrainer = class&#xA; interface ITrainerEstimator&lt;MatrixFactorizationPredictionTransformer, MatrixFactorizationModelParameters&gt;&#xA; interface IEstimator&lt;MatrixFactorizationPredictionTransformer&gt;" />
+>>>>>>> master
  <AssemblyInfo>
  <AssemblyName>Microsoft.ML.Recommender</AssemblyName>
  <AssemblyVersion>1.0.0.0</AssemblyVersion>

dotnet/xml/Microsoft.ML/ImageEstimatorsCatalog.xml

@@ -167,6 +167,15 @@
  [!code-csharp[ExtractPixels](~/../docs/samples/docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/ImageAnalytics/ExtractPixels.cs)]
  ]]></format>
  </example>
+<<<<<<< HEAD
+=======
+ <example>
+ <format type="text/markdown"><![CDATA[
+ [!code-csharp[ExtractPixels](~/../docs/samples/docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/ImageAnalytics/ExtractPixels.cs)]
+ [!code-csharp[ApplyOnnxModel](~/../docs/samples/docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/ApplyONNXModelWithInMemoryImages.cs)]
+ ]]></format>
+ </example>
+>>>>>>> master
  </Docs>
  </Member>
  <Member MemberName="LoadImages">