Closed
58 changes: 57 additions & 1 deletion src/Microsoft.ML.Api/SchemaDefinition.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,9 @@ public VectorTypeAttribute(params int[] dims)
/// column encapsulates.
/// </summary>
[AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
public sealed class ColumnAttribute : Attribute
public class ColumnAttribute : Attribute
{

public ColumnAttribute(string ordinal, string name = null)
{
Name = name;
Expand All@@ -93,6 +94,61 @@ public ColumnAttribute(string ordinal, string name = null)
public string Ordinal { get; }
}

/// <summary>
/// Describes 'Label' column with indicies.
/// </summary>
public sealed class LabelColumnAttribute : ColumnAttribute
{
public LabelColumnAttribute(string ordinal):
base(ordinal, "Label")
{
}
}

/// <summary>
/// Describes 'Features' column with indicies.
/// </summary>
public sealed class FeaturesColumnAttribute : ColumnAttribute
{
public FeaturesColumnAttribute(string ordinal) :
base(ordinal, "Features")
{
}
}

/// <summary>
/// Describes 'Weight' column with indicies.
/// </summary>
public sealed class WeightColumnAttribute : ColumnAttribute
{
public WeightColumnAttribute(string ordinal) :
base(ordinal, "Weight")
{
}
}

/// <summary>
/// Describes 'GroupId' column with indicies.
/// </summary>
public sealed class GroupColumnAttribute : ColumnAttribute
{
public GroupColumnAttribute(string ordinal) :
base(ordinal, "GroupId")
{
}
}

/// <summary>
/// Describes 'Name' column with indicies.
/// </summary>
public sealed class NameColumnAttribute : ColumnAttribute
{
public NameColumnAttribute(string ordinal) :
base(ordinal, "Name")
{
}
}

/// <summary>
/// Allows a member to specify its column name directly, as opposed to the default
/// behavior of using the member name as the column name.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ public class HousePriceData
[Column(ordinal: "1")]
public string Date;

[Column(ordinal: "2", name: "Label")]
[LabelColumn(ordinal: "2")]
public float Price;

[Column(ordinal: "3")]
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Microsoft.ML.Data;
using Microsoft.ML.Models;
using Microsoft.ML.Runtime.Api;
using Microsoft.ML.Trainers;
using Microsoft.ML.Transforms;
using Xunit;

namespace Microsoft.ML.Scenarios
{
public partial class ScenariosTests
{
[Fact]
public void TrainAndPredictIrisModelWithFeatureVectorTest()
{
string dataPath = GetDataPath("iris.data");

var pipeline = new LearningPipeline();

pipeline.Add(new TextLoader(dataPath).CreateFrom<IrisDataWithFeatureVector>(useHeader: false, separator: ','));

pipeline.Add(new Dictionarizer("Label")); // "IrisPlantType" is used as "Label" because of column attribute name on the field.

pipeline.Add(new StochasticDualCoordinateAscentClassifier());

PredictionModel<IrisDataWithFeatureVector, IrisPrediction> model = pipeline.Train<IrisDataWithFeatureVector, IrisPrediction>();

IrisPrediction prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 5.1f, 3.3f, 1.6f, 0.2f }
});

Assert.Equal(1, prediction.PredictedLabels[0], 2);
Assert.Equal(0, prediction.PredictedLabels[1], 2);
Assert.Equal(0, prediction.PredictedLabels[2], 2);

prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 6.4f, 3.1f, 5.5f, 2.2f }
});

Assert.Equal(0, prediction.PredictedLabels[0], 2);
Assert.Equal(0, prediction.PredictedLabels[1], 2);
Assert.Equal(1, prediction.PredictedLabels[2], 2);

prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 4.4f, 3.1f, 2.5f, 1.2f }
});

Assert.Equal(.2, prediction.PredictedLabels[0], 1);
Assert.Equal(.8, prediction.PredictedLabels[1], 1);
Assert.Equal(0, prediction.PredictedLabels[2], 2);

// Note: Testing against the same data set as a simple way to test evaluation.
// This isn't appropriate in real-world scenarios.
string testDataPath = GetDataPath("iris.data");
var testData = new TextLoader(testDataPath).CreateFrom<IrisDataWithFeatureVector>(useHeader: false, separator: ',');

var evaluator = new ClassificationEvaluator();
evaluator.OutputTopKAcc = 3;
ClassificationMetrics metrics = evaluator.Evaluate(model, testData);

Assert.Equal(.98, metrics.AccuracyMacro);
Assert.Equal(.98, metrics.AccuracyMicro, 2);
Assert.Equal(.06, metrics.LogLoss, 2);
Assert.InRange(metrics.LogLossReduction, 94, 96);
Assert.Equal(1, metrics.TopKAccuracy);

Assert.Equal(3, metrics.PerClassLogLoss.Length);
Assert.Equal(0, metrics.PerClassLogLoss[0], 1);
Assert.Equal(.1, metrics.PerClassLogLoss[1], 1);
Assert.Equal(.1, metrics.PerClassLogLoss[2], 1);

ConfusionMatrix matrix = metrics.ConfusionMatrix;
Assert.Equal(3, matrix.Order);
Assert.Equal(3, matrix.ClassNames.Count);
Assert.Equal("Iris-setosa", matrix.ClassNames[0]);
Assert.Equal("Iris-versicolor", matrix.ClassNames[1]);
Assert.Equal("Iris-virginica", matrix.ClassNames[2]);

Assert.Equal(50, matrix[0, 0]);
Assert.Equal(50, matrix["Iris-setosa", "Iris-setosa"]);
Assert.Equal(0, matrix[0, 1]);
Assert.Equal(0, matrix["Iris-setosa", "Iris-versicolor"]);
Assert.Equal(0, matrix[0, 2]);
Assert.Equal(0, matrix["Iris-setosa", "Iris-virginica"]);

Assert.Equal(0, matrix[1, 0]);
Assert.Equal(0, matrix["Iris-versicolor", "Iris-setosa"]);
Assert.Equal(48, matrix[1, 1]);
Assert.Equal(48, matrix["Iris-versicolor", "Iris-versicolor"]);
Assert.Equal(2, matrix[1, 2]);
Assert.Equal(2, matrix["Iris-versicolor", "Iris-virginica"]);

Assert.Equal(0, matrix[2, 0]);
Assert.Equal(0, matrix["Iris-virginica", "Iris-setosa"]);
Assert.Equal(1, matrix[2, 1]);
Assert.Equal(1, matrix["Iris-virginica", "Iris-versicolor"]);
Assert.Equal(49, matrix[2, 2]);
Assert.Equal(49, matrix["Iris-virginica", "Iris-virginica"]);
}

public class IrisDataWithFeatureVector
{
[FeaturesColumn("0-3")]
[VectorType(4)]
public float[] Feat;

[LabelColumn("4")]
public string IrisPlantType;
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,7 +130,7 @@ public class IrisDataWithStringLabel
[Column("3")]
public float PetalLength;

[Column("4", name: "Label")]
[LabelColumn("4")]
public string IrisPlantType;
}
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ public void TrainAndPredictSentimentModelTest()

public class SentimentData
{
[Column(ordinal: "0", name: "Label")]
[LabelColumn(ordinal: "0")]
public float Sentiment;
[Column(ordinal: "1")]
public string SentimentText;
Expand Down
91 changes: 91 additions & 0 deletions test/Microsoft.ML.Tests/TextLoaderTests.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -228,6 +228,79 @@ public void ThrowsExceptionWithPropertyName()
Assert.StartsWith("String1 is missing ColumnAttribute", ex.Message);
}


[Fact]
public void CanSuccessfullyNamedColumns()
{
string dataPath = GetDataPath("SparseData.txt");
var loader = new Data.TextLoader(dataPath).CreateFrom<SparseInputWithNamedColumns>(useHeader: true, allowQuotedStrings: false, supportSparse: true);

using (var environment = new TlcEnvironment())
{
Experiment experiment = environment.CreateExperiment();
ILearningPipelineDataStep output = loader.ApplyStep(null, experiment) as ILearningPipelineDataStep;

experiment.Compile();
loader.SetInput(environment, experiment);
experiment.Run();

IDataLoader data = experiment.GetOutput(output.Data) as IDataLoader;
Assert.NotNull(data);

Assert.Equal(5, data.Schema.ColumnCount);
Assert.Equal("Name", data.Schema.GetColumnName(0));
Assert.Equal("GroupId", data.Schema.GetColumnName(1));
Assert.Equal("Weight", data.Schema.GetColumnName(2));
Assert.Equal("Features", data.Schema.GetColumnName(3));
Assert.Equal("Label", data.Schema.GetColumnName(4));

using (var cursor = data.GetRowCursor((a => true)))
{
var getters = new ValueGetter<float>[]{
cursor.GetGetter<float>(0),
cursor.GetGetter<float>(1),
cursor.GetGetter<float>(2),
cursor.GetGetter<float>(3),
cursor.GetGetter<float>(4)
};


Assert.True(cursor.MoveNext());

float[] targets = new float[] { 1, 2, 3, 4, 5 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.True(cursor.MoveNext());

targets = new float[] { 0, 0, 0, 4, 5 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.True(cursor.MoveNext());

targets = new float[] { 0, 2, 0, 0, 0 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.False(cursor.MoveNext());
}
}

}

public class QuoteInput
{
[Column("0")]
Expand DownExpand Up@@ -268,5 +341,23 @@ public class ModelWithoutColumnAttribute
{
public string String1;
}

public class SparseInputWithNamedColumns
{
[NameColumn("0")]
public float C1;

[GroupColumn("1")]
public float C2;

[WeightColumn("2")]
public float C3;

[FeaturesColumn("3")]
public float C4;

[LabelColumn("4")]
public float C5;
}
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Closed
58 changes: 57 additions & 1 deletion src/Microsoft.ML.Api/SchemaDefinition.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,9 @@ public VectorTypeAttribute(params int[] dims)
/// column encapsulates.
/// </summary>
[AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
public sealed class ColumnAttribute : Attribute
public class ColumnAttribute : Attribute
{

public ColumnAttribute(string ordinal, string name = null)
{
Name = name;
Expand All@@ -93,6 +94,61 @@ public ColumnAttribute(string ordinal, string name = null)
public string Ordinal { get; }
}

/// <summary>
/// Describes 'Label' column with indicies.
/// </summary>
public sealed class LabelColumnAttribute : ColumnAttribute
{
public LabelColumnAttribute(string ordinal):
base(ordinal, "Label")
{
}
}

/// <summary>
/// Describes 'Features' column with indicies.
/// </summary>
public sealed class FeaturesColumnAttribute : ColumnAttribute
{
public FeaturesColumnAttribute(string ordinal) :
base(ordinal, "Features")
{
}
}

/// <summary>
/// Describes 'Weight' column with indicies.
/// </summary>
public sealed class WeightColumnAttribute : ColumnAttribute
{
public WeightColumnAttribute(string ordinal) :
base(ordinal, "Weight")
{
}
}

/// <summary>
/// Describes 'GroupId' column with indicies.
/// </summary>
public sealed class GroupColumnAttribute : ColumnAttribute
{
public GroupColumnAttribute(string ordinal) :
base(ordinal, "GroupId")
{
}
}

/// <summary>
/// Describes 'Name' column with indicies.
/// </summary>
public sealed class NameColumnAttribute : ColumnAttribute
{
public NameColumnAttribute(string ordinal) :
base(ordinal, "Name")
{
}
}

/// <summary>
/// Allows a member to specify its column name directly, as opposed to the default
/// behavior of using the member name as the column name.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ public class HousePriceData
[Column(ordinal: "1")]
public string Date;

[Column(ordinal: "2", name: "Label")]
[LabelColumn(ordinal: "2")]
public float Price;

[Column(ordinal: "3")]
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Microsoft.ML.Data;
using Microsoft.ML.Models;
using Microsoft.ML.Runtime.Api;
using Microsoft.ML.Trainers;
using Microsoft.ML.Transforms;
using Xunit;

namespace Microsoft.ML.Scenarios
{
public partial class ScenariosTests
{
[Fact]
public void TrainAndPredictIrisModelWithFeatureVectorTest()
{
string dataPath = GetDataPath("iris.data");

var pipeline = new LearningPipeline();

pipeline.Add(new TextLoader(dataPath).CreateFrom<IrisDataWithFeatureVector>(useHeader: false, separator: ','));

pipeline.Add(new Dictionarizer("Label")); // "IrisPlantType" is used as "Label" because of column attribute name on the field.

pipeline.Add(new StochasticDualCoordinateAscentClassifier());

PredictionModel<IrisDataWithFeatureVector, IrisPrediction> model = pipeline.Train<IrisDataWithFeatureVector, IrisPrediction>();

IrisPrediction prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 5.1f, 3.3f, 1.6f, 0.2f }
});

Assert.Equal(1, prediction.PredictedLabels[0], 2);
Assert.Equal(0, prediction.PredictedLabels[1], 2);
Assert.Equal(0, prediction.PredictedLabels[2], 2);

prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 6.4f, 3.1f, 5.5f, 2.2f }
});

Assert.Equal(0, prediction.PredictedLabels[0], 2);
Assert.Equal(0, prediction.PredictedLabels[1], 2);
Assert.Equal(1, prediction.PredictedLabels[2], 2);

prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 4.4f, 3.1f, 2.5f, 1.2f }
});

Assert.Equal(.2, prediction.PredictedLabels[0], 1);
Assert.Equal(.8, prediction.PredictedLabels[1], 1);
Assert.Equal(0, prediction.PredictedLabels[2], 2);

// Note: Testing against the same data set as a simple way to test evaluation.
// This isn't appropriate in real-world scenarios.
string testDataPath = GetDataPath("iris.data");
var testData = new TextLoader(testDataPath).CreateFrom<IrisDataWithFeatureVector>(useHeader: false, separator: ',');

var evaluator = new ClassificationEvaluator();
evaluator.OutputTopKAcc = 3;
ClassificationMetrics metrics = evaluator.Evaluate(model, testData);

Assert.Equal(.98, metrics.AccuracyMacro);
Assert.Equal(.98, metrics.AccuracyMicro, 2);
Assert.Equal(.06, metrics.LogLoss, 2);
Assert.InRange(metrics.LogLossReduction, 94, 96);
Assert.Equal(1, metrics.TopKAccuracy);

Assert.Equal(3, metrics.PerClassLogLoss.Length);
Assert.Equal(0, metrics.PerClassLogLoss[0], 1);
Assert.Equal(.1, metrics.PerClassLogLoss[1], 1);
Assert.Equal(.1, metrics.PerClassLogLoss[2], 1);

ConfusionMatrix matrix = metrics.ConfusionMatrix;
Assert.Equal(3, matrix.Order);
Assert.Equal(3, matrix.ClassNames.Count);
Assert.Equal("Iris-setosa", matrix.ClassNames[0]);
Assert.Equal("Iris-versicolor", matrix.ClassNames[1]);
Assert.Equal("Iris-virginica", matrix.ClassNames[2]);

Assert.Equal(50, matrix[0, 0]);
Assert.Equal(50, matrix["Iris-setosa", "Iris-setosa"]);
Assert.Equal(0, matrix[0, 1]);
Assert.Equal(0, matrix["Iris-setosa", "Iris-versicolor"]);
Assert.Equal(0, matrix[0, 2]);
Assert.Equal(0, matrix["Iris-setosa", "Iris-virginica"]);

Assert.Equal(0, matrix[1, 0]);
Assert.Equal(0, matrix["Iris-versicolor", "Iris-setosa"]);
Assert.Equal(48, matrix[1, 1]);
Assert.Equal(48, matrix["Iris-versicolor", "Iris-versicolor"]);
Assert.Equal(2, matrix[1, 2]);
Assert.Equal(2, matrix["Iris-versicolor", "Iris-virginica"]);

Assert.Equal(0, matrix[2, 0]);
Assert.Equal(0, matrix["Iris-virginica", "Iris-setosa"]);
Assert.Equal(1, matrix[2, 1]);
Assert.Equal(1, matrix["Iris-virginica", "Iris-versicolor"]);
Assert.Equal(49, matrix[2, 2]);
Assert.Equal(49, matrix["Iris-virginica", "Iris-virginica"]);
}

public class IrisDataWithFeatureVector
{
[FeaturesColumn("0-3")]
[VectorType(4)]
public float[] Feat;

[LabelColumn("4")]
public string IrisPlantType;
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,7 +130,7 @@ public class IrisDataWithStringLabel
[Column("3")]
public float PetalLength;

[Column("4", name: "Label")]
[LabelColumn("4")]
public string IrisPlantType;
}
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ public void TrainAndPredictSentimentModelTest()

public class SentimentData
{
[Column(ordinal: "0", name: "Label")]
[LabelColumn(ordinal: "0")]
public float Sentiment;
[Column(ordinal: "1")]
public string SentimentText;
Expand Down
91 changes: 91 additions & 0 deletions test/Microsoft.ML.Tests/TextLoaderTests.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -228,6 +228,79 @@ public void ThrowsExceptionWithPropertyName()
Assert.StartsWith("String1 is missing ColumnAttribute", ex.Message);
}


[Fact]
public void CanSuccessfullyNamedColumns()
{
string dataPath = GetDataPath("SparseData.txt");
var loader = new Data.TextLoader(dataPath).CreateFrom<SparseInputWithNamedColumns>(useHeader: true, allowQuotedStrings: false, supportSparse: true);

using (var environment = new TlcEnvironment())
{
Experiment experiment = environment.CreateExperiment();
ILearningPipelineDataStep output = loader.ApplyStep(null, experiment) as ILearningPipelineDataStep;

experiment.Compile();
loader.SetInput(environment, experiment);
experiment.Run();

IDataLoader data = experiment.GetOutput(output.Data) as IDataLoader;
Assert.NotNull(data);

Assert.Equal(5, data.Schema.ColumnCount);
Assert.Equal("Name", data.Schema.GetColumnName(0));
Assert.Equal("GroupId", data.Schema.GetColumnName(1));
Assert.Equal("Weight", data.Schema.GetColumnName(2));
Assert.Equal("Features", data.Schema.GetColumnName(3));
Assert.Equal("Label", data.Schema.GetColumnName(4));

using (var cursor = data.GetRowCursor((a => true)))
{
var getters = new ValueGetter<float>[]{
cursor.GetGetter<float>(0),
cursor.GetGetter<float>(1),
cursor.GetGetter<float>(2),
cursor.GetGetter<float>(3),
cursor.GetGetter<float>(4)
};


Assert.True(cursor.MoveNext());

float[] targets = new float[] { 1, 2, 3, 4, 5 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.True(cursor.MoveNext());

targets = new float[] { 0, 0, 0, 4, 5 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.True(cursor.MoveNext());

targets = new float[] { 0, 2, 0, 0, 0 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.False(cursor.MoveNext());
}
}

}

public class QuoteInput
{
[Column("0")]
Expand DownExpand Up@@ -268,5 +341,23 @@ public class ModelWithoutColumnAttribute
{
public string String1;
}

public class SparseInputWithNamedColumns
{
[NameColumn("0")]
public float C1;

[GroupColumn("1")]
public float C2;

[WeightColumn("2")]
public float C3;

[FeaturesColumn("3")]
public float C4;

[LabelColumn("4")]
public float C5;
}
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
58 changes: 57 additions & 1 deletion src/Microsoft.ML.Api/SchemaDefinition.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,9 @@ public VectorTypeAttribute(params int[] dims)
/// column encapsulates.
/// </summary>
[AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
public sealed class ColumnAttribute : Attribute
public class ColumnAttribute : Attribute
{

public ColumnAttribute(string ordinal, string name = null)
{
Name = name;
Expand All@@ -93,6 +94,61 @@ public ColumnAttribute(string ordinal, string name = null)
public string Ordinal { get; }
}

/// <summary>
/// Describes 'Label' column with indicies.
/// </summary>
public sealed class LabelColumnAttribute : ColumnAttribute
{
public LabelColumnAttribute(string ordinal):
base(ordinal, "Label")
{
}
}

/// <summary>
/// Describes 'Features' column with indicies.
/// </summary>
public sealed class FeaturesColumnAttribute : ColumnAttribute
{
public FeaturesColumnAttribute(string ordinal) :
base(ordinal, "Features")
{
}
}

/// <summary>
/// Describes 'Weight' column with indicies.
/// </summary>
public sealed class WeightColumnAttribute : ColumnAttribute
{
public WeightColumnAttribute(string ordinal) :
base(ordinal, "Weight")
{
}
}

/// <summary>
/// Describes 'GroupId' column with indicies.
/// </summary>
public sealed class GroupColumnAttribute : ColumnAttribute
{
public GroupColumnAttribute(string ordinal) :
base(ordinal, "GroupId")
{
}
}

/// <summary>
/// Describes 'Name' column with indicies.
/// </summary>
public sealed class NameColumnAttribute : ColumnAttribute
{
public NameColumnAttribute(string ordinal) :
base(ordinal, "Name")
{
}
}

/// <summary>
/// Allows a member to specify its column name directly, as opposed to the default
/// behavior of using the member name as the column name.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ public class HousePriceData
[Column(ordinal: "1")]
public string Date;

[Column(ordinal: "2", name: "Label")]
[LabelColumn(ordinal: "2")]
public float Price;

[Column(ordinal: "3")]
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Microsoft.ML.Data;
using Microsoft.ML.Models;
using Microsoft.ML.Runtime.Api;
using Microsoft.ML.Trainers;
using Microsoft.ML.Transforms;
using Xunit;

namespace Microsoft.ML.Scenarios
{
public partial class ScenariosTests
{
[Fact]
public void TrainAndPredictIrisModelWithFeatureVectorTest()
{
string dataPath = GetDataPath("iris.data");

var pipeline = new LearningPipeline();

pipeline.Add(new TextLoader(dataPath).CreateFrom<IrisDataWithFeatureVector>(useHeader: false, separator: ','));

pipeline.Add(new Dictionarizer("Label")); // "IrisPlantType" is used as "Label" because of column attribute name on the field.

pipeline.Add(new StochasticDualCoordinateAscentClassifier());

PredictionModel<IrisDataWithFeatureVector, IrisPrediction> model = pipeline.Train<IrisDataWithFeatureVector, IrisPrediction>();

IrisPrediction prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 5.1f, 3.3f, 1.6f, 0.2f }
});

Assert.Equal(1, prediction.PredictedLabels[0], 2);
Assert.Equal(0, prediction.PredictedLabels[1], 2);
Assert.Equal(0, prediction.PredictedLabels[2], 2);

prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 6.4f, 3.1f, 5.5f, 2.2f }
});

Assert.Equal(0, prediction.PredictedLabels[0], 2);
Assert.Equal(0, prediction.PredictedLabels[1], 2);
Assert.Equal(1, prediction.PredictedLabels[2], 2);

prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 4.4f, 3.1f, 2.5f, 1.2f }
});

Assert.Equal(.2, prediction.PredictedLabels[0], 1);
Assert.Equal(.8, prediction.PredictedLabels[1], 1);
Assert.Equal(0, prediction.PredictedLabels[2], 2);

// Note: Testing against the same data set as a simple way to test evaluation.
// This isn't appropriate in real-world scenarios.
string testDataPath = GetDataPath("iris.data");
var testData = new TextLoader(testDataPath).CreateFrom<IrisDataWithFeatureVector>(useHeader: false, separator: ',');

var evaluator = new ClassificationEvaluator();
evaluator.OutputTopKAcc = 3;
ClassificationMetrics metrics = evaluator.Evaluate(model, testData);

Assert.Equal(.98, metrics.AccuracyMacro);
Assert.Equal(.98, metrics.AccuracyMicro, 2);
Assert.Equal(.06, metrics.LogLoss, 2);
Assert.InRange(metrics.LogLossReduction, 94, 96);
Assert.Equal(1, metrics.TopKAccuracy);

Assert.Equal(3, metrics.PerClassLogLoss.Length);
Assert.Equal(0, metrics.PerClassLogLoss[0], 1);
Assert.Equal(.1, metrics.PerClassLogLoss[1], 1);
Assert.Equal(.1, metrics.PerClassLogLoss[2], 1);

ConfusionMatrix matrix = metrics.ConfusionMatrix;
Assert.Equal(3, matrix.Order);
Assert.Equal(3, matrix.ClassNames.Count);
Assert.Equal("Iris-setosa", matrix.ClassNames[0]);
Assert.Equal("Iris-versicolor", matrix.ClassNames[1]);
Assert.Equal("Iris-virginica", matrix.ClassNames[2]);

Assert.Equal(50, matrix[0, 0]);
Assert.Equal(50, matrix["Iris-setosa", "Iris-setosa"]);
Assert.Equal(0, matrix[0, 1]);
Assert.Equal(0, matrix["Iris-setosa", "Iris-versicolor"]);
Assert.Equal(0, matrix[0, 2]);
Assert.Equal(0, matrix["Iris-setosa", "Iris-virginica"]);

Assert.Equal(0, matrix[1, 0]);
Assert.Equal(0, matrix["Iris-versicolor", "Iris-setosa"]);
Assert.Equal(48, matrix[1, 1]);
Assert.Equal(48, matrix["Iris-versicolor", "Iris-versicolor"]);
Assert.Equal(2, matrix[1, 2]);
Assert.Equal(2, matrix["Iris-versicolor", "Iris-virginica"]);

Assert.Equal(0, matrix[2, 0]);
Assert.Equal(0, matrix["Iris-virginica", "Iris-setosa"]);
Assert.Equal(1, matrix[2, 1]);
Assert.Equal(1, matrix["Iris-virginica", "Iris-versicolor"]);
Assert.Equal(49, matrix[2, 2]);
Assert.Equal(49, matrix["Iris-virginica", "Iris-virginica"]);
}

public class IrisDataWithFeatureVector
{
[FeaturesColumn("0-3")]
[VectorType(4)]
public float[] Feat;

[LabelColumn("4")]
public string IrisPlantType;
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,7 +130,7 @@ public class IrisDataWithStringLabel
[Column("3")]
public float PetalLength;

[Column("4", name: "Label")]
[LabelColumn("4")]
public string IrisPlantType;
}
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ public void TrainAndPredictSentimentModelTest()

public class SentimentData
{
[Column(ordinal: "0", name: "Label")]
[LabelColumn(ordinal: "0")]
public float Sentiment;
[Column(ordinal: "1")]
public string SentimentText;
Expand Down
91 changes: 91 additions & 0 deletions test/Microsoft.ML.Tests/TextLoaderTests.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -228,6 +228,79 @@ public void ThrowsExceptionWithPropertyName()
Assert.StartsWith("String1 is missing ColumnAttribute", ex.Message);
}


[Fact]
public void CanSuccessfullyNamedColumns()
{
string dataPath = GetDataPath("SparseData.txt");
var loader = new Data.TextLoader(dataPath).CreateFrom<SparseInputWithNamedColumns>(useHeader: true, allowQuotedStrings: false, supportSparse: true);

using (var environment = new TlcEnvironment())
{
Experiment experiment = environment.CreateExperiment();
ILearningPipelineDataStep output = loader.ApplyStep(null, experiment) as ILearningPipelineDataStep;

experiment.Compile();
loader.SetInput(environment, experiment);
experiment.Run();

IDataLoader data = experiment.GetOutput(output.Data) as IDataLoader;
Assert.NotNull(data);

Assert.Equal(5, data.Schema.ColumnCount);
Assert.Equal("Name", data.Schema.GetColumnName(0));
Assert.Equal("GroupId", data.Schema.GetColumnName(1));
Assert.Equal("Weight", data.Schema.GetColumnName(2));
Assert.Equal("Features", data.Schema.GetColumnName(3));
Assert.Equal("Label", data.Schema.GetColumnName(4));

using (var cursor = data.GetRowCursor((a => true)))
{
var getters = new ValueGetter<float>[]{
cursor.GetGetter<float>(0),
cursor.GetGetter<float>(1),
cursor.GetGetter<float>(2),
cursor.GetGetter<float>(3),
cursor.GetGetter<float>(4)
};


Assert.True(cursor.MoveNext());

float[] targets = new float[] { 1, 2, 3, 4, 5 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.True(cursor.MoveNext());

targets = new float[] { 0, 0, 0, 4, 5 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.True(cursor.MoveNext());

targets = new float[] { 0, 2, 0, 0, 0 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.False(cursor.MoveNext());
}
}

}

public class QuoteInput
{
[Column("0")]
Expand DownExpand Up@@ -268,5 +341,23 @@ public class ModelWithoutColumnAttribute
{
public string String1;
}

public class SparseInputWithNamedColumns
{
[NameColumn("0")]
public float C1;

[GroupColumn("1")]
public float C2;

[WeightColumn("2")]
public float C3;

[FeaturesColumn("3")]
public float C4;

[LabelColumn("4")]
public float C5;
}
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
58 changes: 57 additions & 1 deletion src/Microsoft.ML.Api/SchemaDefinition.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,9 @@ public VectorTypeAttribute(params int[] dims)
/// column encapsulates.
/// </summary>
[AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
public sealed class ColumnAttribute : Attribute
public class ColumnAttribute : Attribute
{

public ColumnAttribute(string ordinal, string name = null)
{
Name = name;
Expand All@@ -93,6 +94,61 @@ public ColumnAttribute(string ordinal, string name = null)
public string Ordinal { get; }
}

/// <summary>
/// Describes 'Label' column with indicies.
/// </summary>
public sealed class LabelColumnAttribute : ColumnAttribute
{
public LabelColumnAttribute(string ordinal):
base(ordinal, "Label")
{
}
}

/// <summary>
/// Describes 'Features' column with indicies.
/// </summary>
public sealed class FeaturesColumnAttribute : ColumnAttribute
{
public FeaturesColumnAttribute(string ordinal) :
base(ordinal, "Features")
{
}
}

/// <summary>
/// Describes 'Weight' column with indicies.
/// </summary>
public sealed class WeightColumnAttribute : ColumnAttribute
{
public WeightColumnAttribute(string ordinal) :
base(ordinal, "Weight")
{
}
}

/// <summary>
/// Describes 'GroupId' column with indicies.
/// </summary>
public sealed class GroupColumnAttribute : ColumnAttribute
{
public GroupColumnAttribute(string ordinal) :
base(ordinal, "GroupId")
{
}
}

/// <summary>
/// Describes 'Name' column with indicies.
/// </summary>
public sealed class NameColumnAttribute : ColumnAttribute
{
public NameColumnAttribute(string ordinal) :
base(ordinal, "Name")
{
}
}

/// <summary>
/// Allows a member to specify its column name directly, as opposed to the default
/// behavior of using the member name as the column name.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ public class HousePriceData
[Column(ordinal: "1")]
public string Date;

[Column(ordinal: "2", name: "Label")]
[LabelColumn(ordinal: "2")]
public float Price;

[Column(ordinal: "3")]
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Microsoft.ML.Data;
using Microsoft.ML.Models;
using Microsoft.ML.Runtime.Api;
using Microsoft.ML.Trainers;
using Microsoft.ML.Transforms;
using Xunit;

namespace Microsoft.ML.Scenarios
{
public partial class ScenariosTests
{
[Fact]
public void TrainAndPredictIrisModelWithFeatureVectorTest()
{
string dataPath = GetDataPath("iris.data");

var pipeline = new LearningPipeline();

pipeline.Add(new TextLoader(dataPath).CreateFrom<IrisDataWithFeatureVector>(useHeader: false, separator: ','));

pipeline.Add(new Dictionarizer("Label")); // "IrisPlantType" is used as "Label" because of column attribute name on the field.

pipeline.Add(new StochasticDualCoordinateAscentClassifier());

PredictionModel<IrisDataWithFeatureVector, IrisPrediction> model = pipeline.Train<IrisDataWithFeatureVector, IrisPrediction>();

IrisPrediction prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 5.1f, 3.3f, 1.6f, 0.2f }
});

Assert.Equal(1, prediction.PredictedLabels[0], 2);
Assert.Equal(0, prediction.PredictedLabels[1], 2);
Assert.Equal(0, prediction.PredictedLabels[2], 2);

prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 6.4f, 3.1f, 5.5f, 2.2f }
});

Assert.Equal(0, prediction.PredictedLabels[0], 2);
Assert.Equal(0, prediction.PredictedLabels[1], 2);
Assert.Equal(1, prediction.PredictedLabels[2], 2);

prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 4.4f, 3.1f, 2.5f, 1.2f }
});

Assert.Equal(.2, prediction.PredictedLabels[0], 1);
Assert.Equal(.8, prediction.PredictedLabels[1], 1);
Assert.Equal(0, prediction.PredictedLabels[2], 2);

// Note: Testing against the same data set as a simple way to test evaluation.
// This isn't appropriate in real-world scenarios.
string testDataPath = GetDataPath("iris.data");
var testData = new TextLoader(testDataPath).CreateFrom<IrisDataWithFeatureVector>(useHeader: false, separator: ',');

var evaluator = new ClassificationEvaluator();
evaluator.OutputTopKAcc = 3;
ClassificationMetrics metrics = evaluator.Evaluate(model, testData);

Assert.Equal(.98, metrics.AccuracyMacro);
Assert.Equal(.98, metrics.AccuracyMicro, 2);
Assert.Equal(.06, metrics.LogLoss, 2);
Assert.InRange(metrics.LogLossReduction, 94, 96);
Assert.Equal(1, metrics.TopKAccuracy);

Assert.Equal(3, metrics.PerClassLogLoss.Length);
Assert.Equal(0, metrics.PerClassLogLoss[0], 1);
Assert.Equal(.1, metrics.PerClassLogLoss[1], 1);
Assert.Equal(.1, metrics.PerClassLogLoss[2], 1);

ConfusionMatrix matrix = metrics.ConfusionMatrix;
Assert.Equal(3, matrix.Order);
Assert.Equal(3, matrix.ClassNames.Count);
Assert.Equal("Iris-setosa", matrix.ClassNames[0]);
Assert.Equal("Iris-versicolor", matrix.ClassNames[1]);
Assert.Equal("Iris-virginica", matrix.ClassNames[2]);

Assert.Equal(50, matrix[0, 0]);
Assert.Equal(50, matrix["Iris-setosa", "Iris-setosa"]);
Assert.Equal(0, matrix[0, 1]);
Assert.Equal(0, matrix["Iris-setosa", "Iris-versicolor"]);
Assert.Equal(0, matrix[0, 2]);
Assert.Equal(0, matrix["Iris-setosa", "Iris-virginica"]);

Assert.Equal(0, matrix[1, 0]);
Assert.Equal(0, matrix["Iris-versicolor", "Iris-setosa"]);
Assert.Equal(48, matrix[1, 1]);
Assert.Equal(48, matrix["Iris-versicolor", "Iris-versicolor"]);
Assert.Equal(2, matrix[1, 2]);
Assert.Equal(2, matrix["Iris-versicolor", "Iris-virginica"]);

Assert.Equal(0, matrix[2, 0]);
Assert.Equal(0, matrix["Iris-virginica", "Iris-setosa"]);
Assert.Equal(1, matrix[2, 1]);
Assert.Equal(1, matrix["Iris-virginica", "Iris-versicolor"]);
Assert.Equal(49, matrix[2, 2]);
Assert.Equal(49, matrix["Iris-virginica", "Iris-virginica"]);
}

public class IrisDataWithFeatureVector
{
[FeaturesColumn("0-3")]
[VectorType(4)]
public float[] Feat;

[LabelColumn("4")]
public string IrisPlantType;
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,7 +130,7 @@ public class IrisDataWithStringLabel
[Column("3")]
public float PetalLength;

[Column("4", name: "Label")]
[LabelColumn("4")]
public string IrisPlantType;
}
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ public void TrainAndPredictSentimentModelTest()

public class SentimentData
{
[Column(ordinal: "0", name: "Label")]
[LabelColumn(ordinal: "0")]
public float Sentiment;
[Column(ordinal: "1")]
public string SentimentText;
Expand Down
91 changes: 91 additions & 0 deletions test/Microsoft.ML.Tests/TextLoaderTests.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -228,6 +228,79 @@ public void ThrowsExceptionWithPropertyName()
Assert.StartsWith("String1 is missing ColumnAttribute", ex.Message);
}


[Fact]
public void CanSuccessfullyNamedColumns()
{
string dataPath = GetDataPath("SparseData.txt");
var loader = new Data.TextLoader(dataPath).CreateFrom<SparseInputWithNamedColumns>(useHeader: true, allowQuotedStrings: false, supportSparse: true);

using (var environment = new TlcEnvironment())
{
Experiment experiment = environment.CreateExperiment();
ILearningPipelineDataStep output = loader.ApplyStep(null, experiment) as ILearningPipelineDataStep;

experiment.Compile();
loader.SetInput(environment, experiment);
experiment.Run();

IDataLoader data = experiment.GetOutput(output.Data) as IDataLoader;
Assert.NotNull(data);

Assert.Equal(5, data.Schema.ColumnCount);
Assert.Equal("Name", data.Schema.GetColumnName(0));
Assert.Equal("GroupId", data.Schema.GetColumnName(1));
Assert.Equal("Weight", data.Schema.GetColumnName(2));
Assert.Equal("Features", data.Schema.GetColumnName(3));
Assert.Equal("Label", data.Schema.GetColumnName(4));

using (var cursor = data.GetRowCursor((a => true)))
{
var getters = new ValueGetter<float>[]{
cursor.GetGetter<float>(0),
cursor.GetGetter<float>(1),
cursor.GetGetter<float>(2),
cursor.GetGetter<float>(3),
cursor.GetGetter<float>(4)
};


Assert.True(cursor.MoveNext());

float[] targets = new float[] { 1, 2, 3, 4, 5 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.True(cursor.MoveNext());

targets = new float[] { 0, 0, 0, 4, 5 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.True(cursor.MoveNext());

targets = new float[] { 0, 2, 0, 0, 0 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.False(cursor.MoveNext());
}
}

}

public class QuoteInput
{
[Column("0")]
Expand DownExpand Up@@ -268,5 +341,23 @@ public class ModelWithoutColumnAttribute
{
public string String1;
}

public class SparseInputWithNamedColumns
{
[NameColumn("0")]
public float C1;

[GroupColumn("1")]
public float C2;

[WeightColumn("2")]
public float C3;

[FeaturesColumn("3")]
public float C4;

[LabelColumn("4")]
public float C5;
}
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Closed
58 changes: 57 additions & 1 deletion src/Microsoft.ML.Api/SchemaDefinition.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,9 @@ public VectorTypeAttribute(params int[] dims)
/// column encapsulates.
/// </summary>
[AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
public sealed class ColumnAttribute : Attribute
public class ColumnAttribute : Attribute
{

public ColumnAttribute(string ordinal, string name = null)
{
Name = name;
Expand All@@ -93,6 +94,61 @@ public ColumnAttribute(string ordinal, string name = null)
public string Ordinal { get; }
}

/// <summary>
/// Describes 'Label' column with indicies.
/// </summary>
public sealed class LabelColumnAttribute : ColumnAttribute
{
public LabelColumnAttribute(string ordinal):
base(ordinal, "Label")
{
}
}

/// <summary>
/// Describes 'Features' column with indicies.
/// </summary>
public sealed class FeaturesColumnAttribute : ColumnAttribute
{
public FeaturesColumnAttribute(string ordinal) :
base(ordinal, "Features")
{
}
}

/// <summary>
/// Describes 'Weight' column with indicies.
/// </summary>
public sealed class WeightColumnAttribute : ColumnAttribute
{
public WeightColumnAttribute(string ordinal) :
base(ordinal, "Weight")
{
}
}

/// <summary>
/// Describes 'GroupId' column with indicies.
/// </summary>
public sealed class GroupColumnAttribute : ColumnAttribute
{
public GroupColumnAttribute(string ordinal) :
base(ordinal, "GroupId")
{
}
}

/// <summary>
/// Describes 'Name' column with indicies.
/// </summary>
public sealed class NameColumnAttribute : ColumnAttribute
{
public NameColumnAttribute(string ordinal) :
base(ordinal, "Name")
{
}
}

/// <summary>
/// Allows a member to specify its column name directly, as opposed to the default
/// behavior of using the member name as the column name.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ public class HousePriceData
[Column(ordinal: "1")]
public string Date;

[Column(ordinal: "2", name: "Label")]
[LabelColumn(ordinal: "2")]
public float Price;

[Column(ordinal: "3")]
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Microsoft.ML.Data;
using Microsoft.ML.Models;
using Microsoft.ML.Runtime.Api;
using Microsoft.ML.Trainers;
using Microsoft.ML.Transforms;
using Xunit;

namespace Microsoft.ML.Scenarios
{
public partial class ScenariosTests
{
[Fact]
public void TrainAndPredictIrisModelWithFeatureVectorTest()
{
string dataPath = GetDataPath("iris.data");

var pipeline = new LearningPipeline();

pipeline.Add(new TextLoader(dataPath).CreateFrom<IrisDataWithFeatureVector>(useHeader: false, separator: ','));

pipeline.Add(new Dictionarizer("Label")); // "IrisPlantType" is used as "Label" because of column attribute name on the field.

pipeline.Add(new StochasticDualCoordinateAscentClassifier());

PredictionModel<IrisDataWithFeatureVector, IrisPrediction> model = pipeline.Train<IrisDataWithFeatureVector, IrisPrediction>();

IrisPrediction prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 5.1f, 3.3f, 1.6f, 0.2f }
});

Assert.Equal(1, prediction.PredictedLabels[0], 2);
Assert.Equal(0, prediction.PredictedLabels[1], 2);
Assert.Equal(0, prediction.PredictedLabels[2], 2);

prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 6.4f, 3.1f, 5.5f, 2.2f }
});

Assert.Equal(0, prediction.PredictedLabels[0], 2);
Assert.Equal(0, prediction.PredictedLabels[1], 2);
Assert.Equal(1, prediction.PredictedLabels[2], 2);

prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 4.4f, 3.1f, 2.5f, 1.2f }
});

Assert.Equal(.2, prediction.PredictedLabels[0], 1);
Assert.Equal(.8, prediction.PredictedLabels[1], 1);
Assert.Equal(0, prediction.PredictedLabels[2], 2);

// Note: Testing against the same data set as a simple way to test evaluation.
// This isn't appropriate in real-world scenarios.
string testDataPath = GetDataPath("iris.data");
var testData = new TextLoader(testDataPath).CreateFrom<IrisDataWithFeatureVector>(useHeader: false, separator: ',');

var evaluator = new ClassificationEvaluator();
evaluator.OutputTopKAcc = 3;
ClassificationMetrics metrics = evaluator.Evaluate(model, testData);

Assert.Equal(.98, metrics.AccuracyMacro);
Assert.Equal(.98, metrics.AccuracyMicro, 2);
Assert.Equal(.06, metrics.LogLoss, 2);
Assert.InRange(metrics.LogLossReduction, 94, 96);
Assert.Equal(1, metrics.TopKAccuracy);

Assert.Equal(3, metrics.PerClassLogLoss.Length);
Assert.Equal(0, metrics.PerClassLogLoss[0], 1);
Assert.Equal(.1, metrics.PerClassLogLoss[1], 1);
Assert.Equal(.1, metrics.PerClassLogLoss[2], 1);

ConfusionMatrix matrix = metrics.ConfusionMatrix;
Assert.Equal(3, matrix.Order);
Assert.Equal(3, matrix.ClassNames.Count);
Assert.Equal("Iris-setosa", matrix.ClassNames[0]);
Assert.Equal("Iris-versicolor", matrix.ClassNames[1]);
Assert.Equal("Iris-virginica", matrix.ClassNames[2]);

Assert.Equal(50, matrix[0, 0]);
Assert.Equal(50, matrix["Iris-setosa", "Iris-setosa"]);
Assert.Equal(0, matrix[0, 1]);
Assert.Equal(0, matrix["Iris-setosa", "Iris-versicolor"]);
Assert.Equal(0, matrix[0, 2]);
Assert.Equal(0, matrix["Iris-setosa", "Iris-virginica"]);

Assert.Equal(0, matrix[1, 0]);
Assert.Equal(0, matrix["Iris-versicolor", "Iris-setosa"]);
Assert.Equal(48, matrix[1, 1]);
Assert.Equal(48, matrix["Iris-versicolor", "Iris-versicolor"]);
Assert.Equal(2, matrix[1, 2]);
Assert.Equal(2, matrix["Iris-versicolor", "Iris-virginica"]);

Assert.Equal(0, matrix[2, 0]);
Assert.Equal(0, matrix["Iris-virginica", "Iris-setosa"]);
Assert.Equal(1, matrix[2, 1]);
Assert.Equal(1, matrix["Iris-virginica", "Iris-versicolor"]);
Assert.Equal(49, matrix[2, 2]);
Assert.Equal(49, matrix["Iris-virginica", "Iris-virginica"]);
}

public class IrisDataWithFeatureVector
{
[FeaturesColumn("0-3")]
[VectorType(4)]
public float[] Feat;

[LabelColumn("4")]
public string IrisPlantType;
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,7 +130,7 @@ public class IrisDataWithStringLabel
[Column("3")]
public float PetalLength;

[Column("4", name: "Label")]
[LabelColumn("4")]
public string IrisPlantType;
}
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ public void TrainAndPredictSentimentModelTest()

public class SentimentData
{
[Column(ordinal: "0", name: "Label")]
[LabelColumn(ordinal: "0")]
public float Sentiment;
[Column(ordinal: "1")]
public string SentimentText;
Expand Down
91 changes: 91 additions & 0 deletions test/Microsoft.ML.Tests/TextLoaderTests.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -228,6 +228,79 @@ public void ThrowsExceptionWithPropertyName()
Assert.StartsWith("String1 is missing ColumnAttribute", ex.Message);
}


[Fact]
public void CanSuccessfullyNamedColumns()
{
string dataPath = GetDataPath("SparseData.txt");
var loader = new Data.TextLoader(dataPath).CreateFrom<SparseInputWithNamedColumns>(useHeader: true, allowQuotedStrings: false, supportSparse: true);

using (var environment = new TlcEnvironment())
{
Experiment experiment = environment.CreateExperiment();
ILearningPipelineDataStep output = loader.ApplyStep(null, experiment) as ILearningPipelineDataStep;

experiment.Compile();
loader.SetInput(environment, experiment);
experiment.Run();

IDataLoader data = experiment.GetOutput(output.Data) as IDataLoader;
Assert.NotNull(data);

Assert.Equal(5, data.Schema.ColumnCount);
Assert.Equal("Name", data.Schema.GetColumnName(0));
Assert.Equal("GroupId", data.Schema.GetColumnName(1));
Assert.Equal("Weight", data.Schema.GetColumnName(2));
Assert.Equal("Features", data.Schema.GetColumnName(3));
Assert.Equal("Label", data.Schema.GetColumnName(4));

using (var cursor = data.GetRowCursor((a => true)))
{
var getters = new ValueGetter<float>[]{
cursor.GetGetter<float>(0),
cursor.GetGetter<float>(1),
cursor.GetGetter<float>(2),
cursor.GetGetter<float>(3),
cursor.GetGetter<float>(4)
};


Assert.True(cursor.MoveNext());

float[] targets = new float[] { 1, 2, 3, 4, 5 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.True(cursor.MoveNext());

targets = new float[] { 0, 0, 0, 4, 5 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.True(cursor.MoveNext());

targets = new float[] { 0, 2, 0, 0, 0 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.False(cursor.MoveNext());
}
}

}

public class QuoteInput
{
[Column("0")]
Expand DownExpand Up@@ -268,5 +341,23 @@ public class ModelWithoutColumnAttribute
{
public string String1;
}

public class SparseInputWithNamedColumns
{
[NameColumn("0")]
public float C1;

[GroupColumn("1")]
public float C2;

[WeightColumn("2")]
public float C3;

[FeaturesColumn("3")]
public float C4;

[LabelColumn("4")]
public float C5;
}
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
58 changes: 57 additions & 1 deletion src/Microsoft.ML.Api/SchemaDefinition.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,9 @@ public VectorTypeAttribute(params int[] dims)
/// column encapsulates.
/// </summary>
[AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
public sealed class ColumnAttribute : Attribute
public class ColumnAttribute : Attribute
{

public ColumnAttribute(string ordinal, string name = null)
{
Name = name;
Expand All@@ -93,6 +94,61 @@ public ColumnAttribute(string ordinal, string name = null)
public string Ordinal { get; }
}

/// <summary>
/// Describes 'Label' column with indicies.
/// </summary>
public sealed class LabelColumnAttribute : ColumnAttribute
{
public LabelColumnAttribute(string ordinal):
base(ordinal, "Label")
{
}
}

/// <summary>
/// Describes 'Features' column with indicies.
/// </summary>
public sealed class FeaturesColumnAttribute : ColumnAttribute
{
public FeaturesColumnAttribute(string ordinal) :
base(ordinal, "Features")
{
}
}

/// <summary>
/// Describes 'Weight' column with indicies.
/// </summary>
public sealed class WeightColumnAttribute : ColumnAttribute
{
public WeightColumnAttribute(string ordinal) :
base(ordinal, "Weight")
{
}
}

/// <summary>
/// Describes 'GroupId' column with indicies.
/// </summary>
public sealed class GroupColumnAttribute : ColumnAttribute
{
public GroupColumnAttribute(string ordinal) :
base(ordinal, "GroupId")
{
}
}

/// <summary>
/// Describes 'Name' column with indicies.
/// </summary>
public sealed class NameColumnAttribute : ColumnAttribute
{
public NameColumnAttribute(string ordinal) :
base(ordinal, "Name")
{
}
}

/// <summary>
/// Allows a member to specify its column name directly, as opposed to the default
/// behavior of using the member name as the column name.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ public class HousePriceData
[Column(ordinal: "1")]
public string Date;

[Column(ordinal: "2", name: "Label")]
[LabelColumn(ordinal: "2")]
public float Price;

[Column(ordinal: "3")]
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Microsoft.ML.Data;
using Microsoft.ML.Models;
using Microsoft.ML.Runtime.Api;
using Microsoft.ML.Trainers;
using Microsoft.ML.Transforms;
using Xunit;

namespace Microsoft.ML.Scenarios
{
public partial class ScenariosTests
{
[Fact]
public void TrainAndPredictIrisModelWithFeatureVectorTest()
{
string dataPath = GetDataPath("iris.data");

var pipeline = new LearningPipeline();

pipeline.Add(new TextLoader(dataPath).CreateFrom<IrisDataWithFeatureVector>(useHeader: false, separator: ','));

pipeline.Add(new Dictionarizer("Label")); // "IrisPlantType" is used as "Label" because of column attribute name on the field.

pipeline.Add(new StochasticDualCoordinateAscentClassifier());

PredictionModel<IrisDataWithFeatureVector, IrisPrediction> model = pipeline.Train<IrisDataWithFeatureVector, IrisPrediction>();

IrisPrediction prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 5.1f, 3.3f, 1.6f, 0.2f }
});

Assert.Equal(1, prediction.PredictedLabels[0], 2);
Assert.Equal(0, prediction.PredictedLabels[1], 2);
Assert.Equal(0, prediction.PredictedLabels[2], 2);

prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 6.4f, 3.1f, 5.5f, 2.2f }
});

Assert.Equal(0, prediction.PredictedLabels[0], 2);
Assert.Equal(0, prediction.PredictedLabels[1], 2);
Assert.Equal(1, prediction.PredictedLabels[2], 2);

prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 4.4f, 3.1f, 2.5f, 1.2f }
});

Assert.Equal(.2, prediction.PredictedLabels[0], 1);
Assert.Equal(.8, prediction.PredictedLabels[1], 1);
Assert.Equal(0, prediction.PredictedLabels[2], 2);

// Note: Testing against the same data set as a simple way to test evaluation.
// This isn't appropriate in real-world scenarios.
string testDataPath = GetDataPath("iris.data");
var testData = new TextLoader(testDataPath).CreateFrom<IrisDataWithFeatureVector>(useHeader: false, separator: ',');

var evaluator = new ClassificationEvaluator();
evaluator.OutputTopKAcc = 3;
ClassificationMetrics metrics = evaluator.Evaluate(model, testData);

Assert.Equal(.98, metrics.AccuracyMacro);
Assert.Equal(.98, metrics.AccuracyMicro, 2);
Assert.Equal(.06, metrics.LogLoss, 2);
Assert.InRange(metrics.LogLossReduction, 94, 96);
Assert.Equal(1, metrics.TopKAccuracy);

Assert.Equal(3, metrics.PerClassLogLoss.Length);
Assert.Equal(0, metrics.PerClassLogLoss[0], 1);
Assert.Equal(.1, metrics.PerClassLogLoss[1], 1);
Assert.Equal(.1, metrics.PerClassLogLoss[2], 1);

ConfusionMatrix matrix = metrics.ConfusionMatrix;
Assert.Equal(3, matrix.Order);
Assert.Equal(3, matrix.ClassNames.Count);
Assert.Equal("Iris-setosa", matrix.ClassNames[0]);
Assert.Equal("Iris-versicolor", matrix.ClassNames[1]);
Assert.Equal("Iris-virginica", matrix.ClassNames[2]);

Assert.Equal(50, matrix[0, 0]);
Assert.Equal(50, matrix["Iris-setosa", "Iris-setosa"]);
Assert.Equal(0, matrix[0, 1]);
Assert.Equal(0, matrix["Iris-setosa", "Iris-versicolor"]);
Assert.Equal(0, matrix[0, 2]);
Assert.Equal(0, matrix["Iris-setosa", "Iris-virginica"]);

Assert.Equal(0, matrix[1, 0]);
Assert.Equal(0, matrix["Iris-versicolor", "Iris-setosa"]);
Assert.Equal(48, matrix[1, 1]);
Assert.Equal(48, matrix["Iris-versicolor", "Iris-versicolor"]);
Assert.Equal(2, matrix[1, 2]);
Assert.Equal(2, matrix["Iris-versicolor", "Iris-virginica"]);

Assert.Equal(0, matrix[2, 0]);
Assert.Equal(0, matrix["Iris-virginica", "Iris-setosa"]);
Assert.Equal(1, matrix[2, 1]);
Assert.Equal(1, matrix["Iris-virginica", "Iris-versicolor"]);
Assert.Equal(49, matrix[2, 2]);
Assert.Equal(49, matrix["Iris-virginica", "Iris-virginica"]);
}

public class IrisDataWithFeatureVector
{
[FeaturesColumn("0-3")]
[VectorType(4)]
public float[] Feat;

[LabelColumn("4")]
public string IrisPlantType;
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,7 +130,7 @@ public class IrisDataWithStringLabel
[Column("3")]
public float PetalLength;

[Column("4", name: "Label")]
[LabelColumn("4")]
public string IrisPlantType;
}
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ public void TrainAndPredictSentimentModelTest()

public class SentimentData
{
[Column(ordinal: "0", name: "Label")]
[LabelColumn(ordinal: "0")]
public float Sentiment;
[Column(ordinal: "1")]
public string SentimentText;
Expand Down
91 changes: 91 additions & 0 deletions test/Microsoft.ML.Tests/TextLoaderTests.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -228,6 +228,79 @@ public void ThrowsExceptionWithPropertyName()
Assert.StartsWith("String1 is missing ColumnAttribute", ex.Message);
}


[Fact]
public void CanSuccessfullyNamedColumns()
{
string dataPath = GetDataPath("SparseData.txt");
var loader = new Data.TextLoader(dataPath).CreateFrom<SparseInputWithNamedColumns>(useHeader: true, allowQuotedStrings: false, supportSparse: true);

using (var environment = new TlcEnvironment())
{
Experiment experiment = environment.CreateExperiment();
ILearningPipelineDataStep output = loader.ApplyStep(null, experiment) as ILearningPipelineDataStep;

experiment.Compile();
loader.SetInput(environment, experiment);
experiment.Run();

IDataLoader data = experiment.GetOutput(output.Data) as IDataLoader;
Assert.NotNull(data);

Assert.Equal(5, data.Schema.ColumnCount);
Assert.Equal("Name", data.Schema.GetColumnName(0));
Assert.Equal("GroupId", data.Schema.GetColumnName(1));
Assert.Equal("Weight", data.Schema.GetColumnName(2));
Assert.Equal("Features", data.Schema.GetColumnName(3));
Assert.Equal("Label", data.Schema.GetColumnName(4));

using (var cursor = data.GetRowCursor((a => true)))
{
var getters = new ValueGetter<float>[]{
cursor.GetGetter<float>(0),
cursor.GetGetter<float>(1),
cursor.GetGetter<float>(2),
cursor.GetGetter<float>(3),
cursor.GetGetter<float>(4)
};


Assert.True(cursor.MoveNext());

float[] targets = new float[] { 1, 2, 3, 4, 5 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.True(cursor.MoveNext());

targets = new float[] { 0, 0, 0, 4, 5 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.True(cursor.MoveNext());

targets = new float[] { 0, 2, 0, 0, 0 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.False(cursor.MoveNext());
}
}

}

public class QuoteInput
{
[Column("0")]
Expand DownExpand Up@@ -268,5 +341,23 @@ public class ModelWithoutColumnAttribute
{
public string String1;
}

public class SparseInputWithNamedColumns
{
[NameColumn("0")]
public float C1;

[GroupColumn("1")]
public float C2;

[WeightColumn("2")]
public float C3;

[FeaturesColumn("3")]
public float C4;

[LabelColumn("4")]
public float C5;
}
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
58 changes: 57 additions & 1 deletion src/Microsoft.ML.Api/SchemaDefinition.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,9 @@ public VectorTypeAttribute(params int[] dims)
/// column encapsulates.
/// </summary>
[AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
public sealed class ColumnAttribute : Attribute
public class ColumnAttribute : Attribute
{

public ColumnAttribute(string ordinal, string name = null)
{
Name = name;
Expand All@@ -93,6 +94,61 @@ public ColumnAttribute(string ordinal, string name = null)
public string Ordinal { get; }
}

/// <summary>
/// Describes 'Label' column with indicies.
/// </summary>
public sealed class LabelColumnAttribute : ColumnAttribute
{
public LabelColumnAttribute(string ordinal):
base(ordinal, "Label")
{
}
}

/// <summary>
/// Describes 'Features' column with indicies.
/// </summary>
public sealed class FeaturesColumnAttribute : ColumnAttribute
{
public FeaturesColumnAttribute(string ordinal) :
base(ordinal, "Features")
{
}
}

/// <summary>
/// Describes 'Weight' column with indicies.
/// </summary>
public sealed class WeightColumnAttribute : ColumnAttribute
{
public WeightColumnAttribute(string ordinal) :
base(ordinal, "Weight")
{
}
}

/// <summary>
/// Describes 'GroupId' column with indicies.
/// </summary>
public sealed class GroupColumnAttribute : ColumnAttribute
{
public GroupColumnAttribute(string ordinal) :
base(ordinal, "GroupId")
{
}
}

/// <summary>
/// Describes 'Name' column with indicies.
/// </summary>
public sealed class NameColumnAttribute : ColumnAttribute
{
public NameColumnAttribute(string ordinal) :
base(ordinal, "Name")
{
}
}

/// <summary>
/// Allows a member to specify its column name directly, as opposed to the default
/// behavior of using the member name as the column name.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ public class HousePriceData
[Column(ordinal: "1")]
public string Date;

[Column(ordinal: "2", name: "Label")]
[LabelColumn(ordinal: "2")]
public float Price;

[Column(ordinal: "3")]
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Microsoft.ML.Data;
using Microsoft.ML.Models;
using Microsoft.ML.Runtime.Api;
using Microsoft.ML.Trainers;
using Microsoft.ML.Transforms;
using Xunit;

namespace Microsoft.ML.Scenarios
{
public partial class ScenariosTests
{
[Fact]
public void TrainAndPredictIrisModelWithFeatureVectorTest()
{
string dataPath = GetDataPath("iris.data");

var pipeline = new LearningPipeline();

pipeline.Add(new TextLoader(dataPath).CreateFrom<IrisDataWithFeatureVector>(useHeader: false, separator: ','));

pipeline.Add(new Dictionarizer("Label")); // "IrisPlantType" is used as "Label" because of column attribute name on the field.

pipeline.Add(new StochasticDualCoordinateAscentClassifier());

PredictionModel<IrisDataWithFeatureVector, IrisPrediction> model = pipeline.Train<IrisDataWithFeatureVector, IrisPrediction>();

IrisPrediction prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 5.1f, 3.3f, 1.6f, 0.2f }
});

Assert.Equal(1, prediction.PredictedLabels[0], 2);
Assert.Equal(0, prediction.PredictedLabels[1], 2);
Assert.Equal(0, prediction.PredictedLabels[2], 2);

prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 6.4f, 3.1f, 5.5f, 2.2f }
});

Assert.Equal(0, prediction.PredictedLabels[0], 2);
Assert.Equal(0, prediction.PredictedLabels[1], 2);
Assert.Equal(1, prediction.PredictedLabels[2], 2);

prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 4.4f, 3.1f, 2.5f, 1.2f }
});

Assert.Equal(.2, prediction.PredictedLabels[0], 1);
Assert.Equal(.8, prediction.PredictedLabels[1], 1);
Assert.Equal(0, prediction.PredictedLabels[2], 2);

// Note: Testing against the same data set as a simple way to test evaluation.
// This isn't appropriate in real-world scenarios.
string testDataPath = GetDataPath("iris.data");
var testData = new TextLoader(testDataPath).CreateFrom<IrisDataWithFeatureVector>(useHeader: false, separator: ',');

var evaluator = new ClassificationEvaluator();
evaluator.OutputTopKAcc = 3;
ClassificationMetrics metrics = evaluator.Evaluate(model, testData);

Assert.Equal(.98, metrics.AccuracyMacro);
Assert.Equal(.98, metrics.AccuracyMicro, 2);
Assert.Equal(.06, metrics.LogLoss, 2);
Assert.InRange(metrics.LogLossReduction, 94, 96);
Assert.Equal(1, metrics.TopKAccuracy);

Assert.Equal(3, metrics.PerClassLogLoss.Length);
Assert.Equal(0, metrics.PerClassLogLoss[0], 1);
Assert.Equal(.1, metrics.PerClassLogLoss[1], 1);
Assert.Equal(.1, metrics.PerClassLogLoss[2], 1);

ConfusionMatrix matrix = metrics.ConfusionMatrix;
Assert.Equal(3, matrix.Order);
Assert.Equal(3, matrix.ClassNames.Count);
Assert.Equal("Iris-setosa", matrix.ClassNames[0]);
Assert.Equal("Iris-versicolor", matrix.ClassNames[1]);
Assert.Equal("Iris-virginica", matrix.ClassNames[2]);

Assert.Equal(50, matrix[0, 0]);
Assert.Equal(50, matrix["Iris-setosa", "Iris-setosa"]);
Assert.Equal(0, matrix[0, 1]);
Assert.Equal(0, matrix["Iris-setosa", "Iris-versicolor"]);
Assert.Equal(0, matrix[0, 2]);
Assert.Equal(0, matrix["Iris-setosa", "Iris-virginica"]);

Assert.Equal(0, matrix[1, 0]);
Assert.Equal(0, matrix["Iris-versicolor", "Iris-setosa"]);
Assert.Equal(48, matrix[1, 1]);
Assert.Equal(48, matrix["Iris-versicolor", "Iris-versicolor"]);
Assert.Equal(2, matrix[1, 2]);
Assert.Equal(2, matrix["Iris-versicolor", "Iris-virginica"]);

Assert.Equal(0, matrix[2, 0]);
Assert.Equal(0, matrix["Iris-virginica", "Iris-setosa"]);
Assert.Equal(1, matrix[2, 1]);
Assert.Equal(1, matrix["Iris-virginica", "Iris-versicolor"]);
Assert.Equal(49, matrix[2, 2]);
Assert.Equal(49, matrix["Iris-virginica", "Iris-virginica"]);
}

public class IrisDataWithFeatureVector
{
[FeaturesColumn("0-3")]
[VectorType(4)]
public float[] Feat;

[LabelColumn("4")]
public string IrisPlantType;
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,7 +130,7 @@ public class IrisDataWithStringLabel
[Column("3")]
public float PetalLength;

[Column("4", name: "Label")]
[LabelColumn("4")]
public string IrisPlantType;
}
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ public void TrainAndPredictSentimentModelTest()

public class SentimentData
{
[Column(ordinal: "0", name: "Label")]
[LabelColumn(ordinal: "0")]
public float Sentiment;
[Column(ordinal: "1")]
public string SentimentText;
Expand Down
91 changes: 91 additions & 0 deletions test/Microsoft.ML.Tests/TextLoaderTests.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -228,6 +228,79 @@ public void ThrowsExceptionWithPropertyName()
Assert.StartsWith("String1 is missing ColumnAttribute", ex.Message);
}


[Fact]
public void CanSuccessfullyNamedColumns()
{
string dataPath = GetDataPath("SparseData.txt");
var loader = new Data.TextLoader(dataPath).CreateFrom<SparseInputWithNamedColumns>(useHeader: true, allowQuotedStrings: false, supportSparse: true);

using (var environment = new TlcEnvironment())
{
Experiment experiment = environment.CreateExperiment();
ILearningPipelineDataStep output = loader.ApplyStep(null, experiment) as ILearningPipelineDataStep;

experiment.Compile();
loader.SetInput(environment, experiment);
experiment.Run();

IDataLoader data = experiment.GetOutput(output.Data) as IDataLoader;
Assert.NotNull(data);

Assert.Equal(5, data.Schema.ColumnCount);
Assert.Equal("Name", data.Schema.GetColumnName(0));
Assert.Equal("GroupId", data.Schema.GetColumnName(1));
Assert.Equal("Weight", data.Schema.GetColumnName(2));
Assert.Equal("Features", data.Schema.GetColumnName(3));
Assert.Equal("Label", data.Schema.GetColumnName(4));

using (var cursor = data.GetRowCursor((a => true)))
{
var getters = new ValueGetter<float>[]{
cursor.GetGetter<float>(0),
cursor.GetGetter<float>(1),
cursor.GetGetter<float>(2),
cursor.GetGetter<float>(3),
cursor.GetGetter<float>(4)
};


Assert.True(cursor.MoveNext());

float[] targets = new float[] { 1, 2, 3, 4, 5 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.True(cursor.MoveNext());

targets = new float[] { 0, 0, 0, 4, 5 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.True(cursor.MoveNext());

targets = new float[] { 0, 2, 0, 0, 0 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.False(cursor.MoveNext());
}
}

}

public class QuoteInput
{
[Column("0")]
Expand DownExpand Up@@ -268,5 +341,23 @@ public class ModelWithoutColumnAttribute
{
public string String1;
}

public class SparseInputWithNamedColumns
{
[NameColumn("0")]
public float C1;

[GroupColumn("1")]
public float C2;

[WeightColumn("2")]
public float C3;

[FeaturesColumn("3")]
public float C4;

[LabelColumn("4")]
public float C5;
}
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Closed
58 changes: 57 additions & 1 deletion src/Microsoft.ML.Api/SchemaDefinition.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,9 @@ public VectorTypeAttribute(params int[] dims)
/// column encapsulates.
/// </summary>
[AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
public sealed class ColumnAttribute : Attribute
public class ColumnAttribute : Attribute
{

public ColumnAttribute(string ordinal, string name = null)
{
Name = name;
Expand All@@ -93,6 +94,61 @@ public ColumnAttribute(string ordinal, string name = null)
public string Ordinal { get; }
}

/// <summary>
/// Describes 'Label' column with indicies.
/// </summary>
public sealed class LabelColumnAttribute : ColumnAttribute
{
public LabelColumnAttribute(string ordinal):
base(ordinal, "Label")
{
}
}

/// <summary>
/// Describes 'Features' column with indicies.
/// </summary>
public sealed class FeaturesColumnAttribute : ColumnAttribute
{
public FeaturesColumnAttribute(string ordinal) :
base(ordinal, "Features")
{
}
}

/// <summary>
/// Describes 'Weight' column with indicies.
/// </summary>
public sealed class WeightColumnAttribute : ColumnAttribute
{
public WeightColumnAttribute(string ordinal) :
base(ordinal, "Weight")
{
}
}

/// <summary>
/// Describes 'GroupId' column with indicies.
/// </summary>
public sealed class GroupColumnAttribute : ColumnAttribute
{
public GroupColumnAttribute(string ordinal) :
base(ordinal, "GroupId")
{
}
}

/// <summary>
/// Describes 'Name' column with indicies.
/// </summary>
public sealed class NameColumnAttribute : ColumnAttribute
{
public NameColumnAttribute(string ordinal) :
base(ordinal, "Name")
{
}
}

/// <summary>
/// Allows a member to specify its column name directly, as opposed to the default
/// behavior of using the member name as the column name.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ public class HousePriceData
[Column(ordinal: "1")]
public string Date;

[Column(ordinal: "2", name: "Label")]
[LabelColumn(ordinal: "2")]
public float Price;

[Column(ordinal: "3")]
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Microsoft.ML.Data;
using Microsoft.ML.Models;
using Microsoft.ML.Runtime.Api;
using Microsoft.ML.Trainers;
using Microsoft.ML.Transforms;
using Xunit;

namespace Microsoft.ML.Scenarios
{
public partial class ScenariosTests
{
[Fact]
public void TrainAndPredictIrisModelWithFeatureVectorTest()
{
string dataPath = GetDataPath("iris.data");

var pipeline = new LearningPipeline();

pipeline.Add(new TextLoader(dataPath).CreateFrom<IrisDataWithFeatureVector>(useHeader: false, separator: ','));

pipeline.Add(new Dictionarizer("Label")); // "IrisPlantType" is used as "Label" because of column attribute name on the field.

pipeline.Add(new StochasticDualCoordinateAscentClassifier());

PredictionModel<IrisDataWithFeatureVector, IrisPrediction> model = pipeline.Train<IrisDataWithFeatureVector, IrisPrediction>();

IrisPrediction prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 5.1f, 3.3f, 1.6f, 0.2f }
});

Assert.Equal(1, prediction.PredictedLabels[0], 2);
Assert.Equal(0, prediction.PredictedLabels[1], 2);
Assert.Equal(0, prediction.PredictedLabels[2], 2);

prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 6.4f, 3.1f, 5.5f, 2.2f }
});

Assert.Equal(0, prediction.PredictedLabels[0], 2);
Assert.Equal(0, prediction.PredictedLabels[1], 2);
Assert.Equal(1, prediction.PredictedLabels[2], 2);

prediction = model.Predict(new IrisDataWithFeatureVector()
{
Feat = new float[] { 4.4f, 3.1f, 2.5f, 1.2f }
});

Assert.Equal(.2, prediction.PredictedLabels[0], 1);
Assert.Equal(.8, prediction.PredictedLabels[1], 1);
Assert.Equal(0, prediction.PredictedLabels[2], 2);

// Note: Testing against the same data set as a simple way to test evaluation.
// This isn't appropriate in real-world scenarios.
string testDataPath = GetDataPath("iris.data");
var testData = new TextLoader(testDataPath).CreateFrom<IrisDataWithFeatureVector>(useHeader: false, separator: ',');

var evaluator = new ClassificationEvaluator();
evaluator.OutputTopKAcc = 3;
ClassificationMetrics metrics = evaluator.Evaluate(model, testData);

Assert.Equal(.98, metrics.AccuracyMacro);
Assert.Equal(.98, metrics.AccuracyMicro, 2);
Assert.Equal(.06, metrics.LogLoss, 2);
Assert.InRange(metrics.LogLossReduction, 94, 96);
Assert.Equal(1, metrics.TopKAccuracy);

Assert.Equal(3, metrics.PerClassLogLoss.Length);
Assert.Equal(0, metrics.PerClassLogLoss[0], 1);
Assert.Equal(.1, metrics.PerClassLogLoss[1], 1);
Assert.Equal(.1, metrics.PerClassLogLoss[2], 1);

ConfusionMatrix matrix = metrics.ConfusionMatrix;
Assert.Equal(3, matrix.Order);
Assert.Equal(3, matrix.ClassNames.Count);
Assert.Equal("Iris-setosa", matrix.ClassNames[0]);
Assert.Equal("Iris-versicolor", matrix.ClassNames[1]);
Assert.Equal("Iris-virginica", matrix.ClassNames[2]);

Assert.Equal(50, matrix[0, 0]);
Assert.Equal(50, matrix["Iris-setosa", "Iris-setosa"]);
Assert.Equal(0, matrix[0, 1]);
Assert.Equal(0, matrix["Iris-setosa", "Iris-versicolor"]);
Assert.Equal(0, matrix[0, 2]);
Assert.Equal(0, matrix["Iris-setosa", "Iris-virginica"]);

Assert.Equal(0, matrix[1, 0]);
Assert.Equal(0, matrix["Iris-versicolor", "Iris-setosa"]);
Assert.Equal(48, matrix[1, 1]);
Assert.Equal(48, matrix["Iris-versicolor", "Iris-versicolor"]);
Assert.Equal(2, matrix[1, 2]);
Assert.Equal(2, matrix["Iris-versicolor", "Iris-virginica"]);

Assert.Equal(0, matrix[2, 0]);
Assert.Equal(0, matrix["Iris-virginica", "Iris-setosa"]);
Assert.Equal(1, matrix[2, 1]);
Assert.Equal(1, matrix["Iris-virginica", "Iris-versicolor"]);
Assert.Equal(49, matrix[2, 2]);
Assert.Equal(49, matrix["Iris-virginica", "Iris-virginica"]);
}

public class IrisDataWithFeatureVector
{
[FeaturesColumn("0-3")]
[VectorType(4)]
public float[] Feat;

[LabelColumn("4")]
public string IrisPlantType;
}
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,7 +130,7 @@ public class IrisDataWithStringLabel
[Column("3")]
public float PetalLength;

[Column("4", name: "Label")]
[LabelColumn("4")]
public string IrisPlantType;
}
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ public void TrainAndPredictSentimentModelTest()

public class SentimentData
{
[Column(ordinal: "0", name: "Label")]
[LabelColumn(ordinal: "0")]
public float Sentiment;
[Column(ordinal: "1")]
public string SentimentText;
Expand Down
91 changes: 91 additions & 0 deletions test/Microsoft.ML.Tests/TextLoaderTests.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -228,6 +228,79 @@ public void ThrowsExceptionWithPropertyName()
Assert.StartsWith("String1 is missing ColumnAttribute", ex.Message);
}


[Fact]
public void CanSuccessfullyNamedColumns()
{
string dataPath = GetDataPath("SparseData.txt");
var loader = new Data.TextLoader(dataPath).CreateFrom<SparseInputWithNamedColumns>(useHeader: true, allowQuotedStrings: false, supportSparse: true);

using (var environment = new TlcEnvironment())
{
Experiment experiment = environment.CreateExperiment();
ILearningPipelineDataStep output = loader.ApplyStep(null, experiment) as ILearningPipelineDataStep;

experiment.Compile();
loader.SetInput(environment, experiment);
experiment.Run();

IDataLoader data = experiment.GetOutput(output.Data) as IDataLoader;
Assert.NotNull(data);

Assert.Equal(5, data.Schema.ColumnCount);
Assert.Equal("Name", data.Schema.GetColumnName(0));
Assert.Equal("GroupId", data.Schema.GetColumnName(1));
Assert.Equal("Weight", data.Schema.GetColumnName(2));
Assert.Equal("Features", data.Schema.GetColumnName(3));
Assert.Equal("Label", data.Schema.GetColumnName(4));

using (var cursor = data.GetRowCursor((a => true)))
{
var getters = new ValueGetter<float>[]{
cursor.GetGetter<float>(0),
cursor.GetGetter<float>(1),
cursor.GetGetter<float>(2),
cursor.GetGetter<float>(3),
cursor.GetGetter<float>(4)
};


Assert.True(cursor.MoveNext());

float[] targets = new float[] { 1, 2, 3, 4, 5 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.True(cursor.MoveNext());

targets = new float[] { 0, 0, 0, 4, 5 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.True(cursor.MoveNext());

targets = new float[] { 0, 2, 0, 0, 0 };
for (int i = 0; i < getters.Length; i++)
{
float value = 0;
getters[i](ref value);
Assert.Equal(targets[i], value);
}

Assert.False(cursor.MoveNext());
}
}

}

public class QuoteInput
{
[Column("0")]
Expand DownExpand Up@@ -268,5 +341,23 @@ public class ModelWithoutColumnAttribute
{
public string String1;
}

public class SparseInputWithNamedColumns
{
[NameColumn("0")]
public float C1;

[GroupColumn("1")]
public float C2;

[WeightColumn("2")]
public float C3;

[FeaturesColumn("3")]
public float C4;

[LabelColumn("4")]
public float C5;
}
}
}