Pulling metric names directly from evaluators#276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
george-microsoft merged 1 commit into from
May 31, 2018
Merged

Pulling metric names directly from evaluators #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
199 changes: 100 additions & 99 deletions src/Microsoft.ML.Data/EntryPoints/InputBuilder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.Reflection;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Internal.Utilities;
using Microsoft.ML.Runtime.Data;
using Newtonsoft.Json.Linq;

namespace Microsoft.ML.Runtime.EntryPoints.JsonUtils
Expand DownExpand Up@@ -425,81 +426,81 @@ private static object ParseJsonValue(IExceptionContext ectx, Type type, Attribut
{
switch (dt)
{
case TlcModule.DataKind.Bool:
return value.Value<bool>();
case TlcModule.DataKind.String:
return value.Value<string>();
case TlcModule.DataKind.Char:
return value.Value<char>();
case TlcModule.DataKind.Enum:
if (!Enum.IsDefined(type, value.Value<string>()))
throw ectx.Except($"Requested value '{value.Value<string>()}' is not a member of the Enum type '{type.Name}'");
return Enum.Parse(type, value.Value<string>());
case TlcModule.DataKind.Float:
if (type == typeof(double))
return value.Value<double>();
else if (type == typeof(float))
return value.Value<float>();
else
{
case TlcModule.DataKind.Bool:
return value.Value<bool>();
case TlcModule.DataKind.String:
return value.Value<string>();
case TlcModule.DataKind.Char:
return value.Value<char>();
case TlcModule.DataKind.Enum:
if (!Enum.IsDefined(type, value.Value<string>()))
throw ectx.Except($"Requested value '{value.Value<string>()}' is not a member of the Enum type '{type.Name}'");
return Enum.Parse(type, value.Value<string>());
case TlcModule.DataKind.Float:
if (type == typeof(double))
return value.Value<double>();
else if (type == typeof(float))
return value.Value<float>();
else
{
ectx.Assert(false);
throw ectx.ExceptNotSupp();
}
case TlcModule.DataKind.Array:
var ja = value as JArray;
ectx.Check(ja != null, "Expected array value");
Func<IExceptionContext, JArray, Attributes, ModuleCatalog, object> makeArray = MakeArray<int>;
return Utils.MarshalInvoke(makeArray, type.GetElementType(), ectx, ja, attributes, catalog);
case TlcModule.DataKind.Int:
if (type == typeof(long))
return value.Value<long>();
if (type == typeof(int))
return value.Value<int>();
ectx.Assert(false);
throw ectx.ExceptNotSupp();
}
case TlcModule.DataKind.Array:
var ja = value as JArray;
ectx.Check(ja != null, "Expected array value");
Func<IExceptionContext, JArray, Attributes, ModuleCatalog, object> makeArray = MakeArray<int>;
return Utils.MarshalInvoke(makeArray, type.GetElementType(), ectx, ja, attributes, catalog);
case TlcModule.DataKind.Int:
if (type == typeof(long))
return value.Value<long>();
if (type == typeof(int))
return value.Value<int>();
ectx.Assert(false);
throw ectx.ExceptNotSupp();
case TlcModule.DataKind.UInt:
if (type == typeof(ulong))
return value.Value<ulong>();
if (type == typeof(uint))
return value.Value<uint>();
ectx.Assert(false);
throw ectx.ExceptNotSupp();
case TlcModule.DataKind.Dictionary:
ectx.Check(value is JObject, "Expected object value");
Func<IExceptionContext, JObject, Attributes, ModuleCatalog, object> makeDict = MakeDictionary<int>;
return Utils.MarshalInvoke(makeDict, type.GetGenericArguments()[1], ectx, (JObject)value, attributes, catalog);
case TlcModule.DataKind.Component:
var jo = value as JObject;
ectx.Check(jo != null, "Expected object value");
// REVIEW: consider accepting strings alone.
var jName = jo[FieldNames.Name];
ectx.Check(jName != null, "Field '" + FieldNames.Name + "' is required for component.");
ectx.Check(jName is JValue, "Expected '" + FieldNames.Name + "' field to be a string.");
var name = jName.Value<string>();
ectx.Check(jo[FieldNames.Settings] == null || jo[FieldNames.Settings] is JObject,
"Expected '" + FieldNames.Settings + "' field to be an object");
return GetComponentJson(ectx, type, name, jo[FieldNames.Settings] as JObject, catalog);
default:
var settings = value as JObject;
ectx.Check(settings != null, "Expected object value");
var inputBuilder = new InputBuilder(ectx, type, catalog);

if (inputBuilder._fields.Length == 0)
throw ectx.Except($"Unsupported input type: {dt}");

if (settings != null)
{
foreach (var pair in settings)
case TlcModule.DataKind.UInt:
if (type == typeof(ulong))
return value.Value<ulong>();
if (type == typeof(uint))
return value.Value<uint>();
ectx.Assert(false);
throw ectx.ExceptNotSupp();
case TlcModule.DataKind.Dictionary:
ectx.Check(value is JObject, "Expected object value");
Func<IExceptionContext, JObject, Attributes, ModuleCatalog, object> makeDict = MakeDictionary<int>;
return Utils.MarshalInvoke(makeDict, type.GetGenericArguments()[1], ectx, (JObject)value, attributes, catalog);
case TlcModule.DataKind.Component:
var jo = value as JObject;
ectx.Check(jo != null, "Expected object value");
// REVIEW: consider accepting strings alone.
var jName = jo[FieldNames.Name];
ectx.Check(jName != null, "Field '" + FieldNames.Name + "' is required for component.");
ectx.Check(jName is JValue, "Expected '" + FieldNames.Name + "' field to be a string.");
var name = jName.Value<string>();
ectx.Check(jo[FieldNames.Settings] == null || jo[FieldNames.Settings] is JObject,
"Expected '" + FieldNames.Settings + "' field to be an object");
return GetComponentJson(ectx, type, name, jo[FieldNames.Settings] as JObject, catalog);
default:
var settings = value as JObject;
ectx.Check(settings != null, "Expected object value");
var inputBuilder = new InputBuilder(ectx, type, catalog);

if (inputBuilder._fields.Length == 0)
throw ectx.Except($"Unsupported input type: {dt}");

if (settings != null)
{
if (!inputBuilder.TrySetValueJson(pair.Key, pair.Value))
throw ectx.Except($"Unexpected value for component '{type}', field '{pair.Key}': '{pair.Value}'");
foreach (var pair in settings)
{
if (!inputBuilder.TrySetValueJson(pair.Key, pair.Value))
throw ectx.Except($"Unexpected value for component '{type}', field '{pair.Key}': '{pair.Value}'");
}
}
}

var missing = inputBuilder.GetMissingValues().ToArray();
if (missing.Length > 0)
throw ectx.Except($"The following required inputs were not provided for component '{type}': {string.Join(", ", missing)}");
return inputBuilder.GetInstance();
var missing = inputBuilder.GetMissingValues().ToArray();
if (missing.Length > 0)
throw ectx.Except($"The following required inputs were not provided for component '{type}': {string.Join(", ", missing)}");
return inputBuilder.GetInstance();
}
}
catch (FormatException ex)
Expand DownExpand Up@@ -832,35 +833,35 @@ public static class SweepableDiscreteParam
public static class PipelineSweeperSupportedMetrics
{
public new static string ToString() => "SupportedMetric";
public const string Auc = "AUC";
public const string AccuracyMicro = "AccuracyMicro";
public const string AccuracyMacro = "AccuracyMacro";
public const string F1 = "F1";
public const string AuPrc = "AUPRC";
public const string TopKAccuracy = "TopKAccuracy";
public const string L1 = "L1";
public const string L2 = "L2";
public const string Rms = "RMS";
public const string LossFn = "LossFn";
public const string RSquared = "RSquared";
public const string LogLoss = "LogLoss";
public const string LogLossReduction = "LogLossReduction";
public const string Ndcg = "NDCG";
public const string Dcg = "DCG";
public const string PositivePrecision = "PositivePrecision";
public const string PositiveRecall = "PositiveRecall";
public const string NegativePrecision = "NegativePrecision";
public const string NegativeRecall = "NegativeRecall";
public const string DrAtK = "DrAtK";
public const string DrAtPFpr = "DrAtPFpr";
public const string DrAtNumPos = "DrAtNumPos";
public const string NumAnomalies = "NumAnomalies";
public const string ThreshAtK = "ThreshAtK";
public const string ThreshAtP = "ThreshAtP";
public const string ThreshAtNumPos = "ThreshAtNumPos";
public const string Nmi = "NMI";
public const string AvgMinScore = "AvgMinScore";
public const string Dbi = "DBI";
public const string Auc = BinaryClassifierEvaluator.Auc;
public const string AccuracyMicro = Data.MultiClassClassifierEvaluator.AccuracyMicro;
public const string AccuracyMacro = MultiClassClassifierEvaluator.AccuracyMacro;
public const string F1 = BinaryClassifierEvaluator.F1;
public const string AuPrc = BinaryClassifierEvaluator.AuPrc;
public const string TopKAccuracy = MultiClassClassifierEvaluator.TopKAccuracy;
public const string L1 = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.L1;
public const string L2 = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.L2;
public const string Rms = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.Rms;
public const string LossFn = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.Loss;
public const string RSquared = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.RSquared;
public const string LogLoss = BinaryClassifierEvaluator.LogLoss;
public const string LogLossReduction = BinaryClassifierEvaluator.LogLossReduction;
public const string Ndcg = RankerEvaluator.Ndcg;
public const string Dcg = RankerEvaluator.Dcg;
public const string PositivePrecision = BinaryClassifierEvaluator.PosPrecName;
public const string PositiveRecall = BinaryClassifierEvaluator.PosRecallName;
public const string NegativePrecision = BinaryClassifierEvaluator.NegPrecName;
public const string NegativeRecall = BinaryClassifierEvaluator.NegRecallName;
public const string DrAtK = AnomalyDetectionEvaluator.OverallMetrics.DrAtK;
public const string DrAtPFpr = AnomalyDetectionEvaluator.OverallMetrics.DrAtPFpr;
public const string DrAtNumPos = AnomalyDetectionEvaluator.OverallMetrics.DrAtNumPos;
public const string NumAnomalies = AnomalyDetectionEvaluator.OverallMetrics.NumAnomalies;
public const string ThreshAtK = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtK;
public const string ThreshAtP = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtP;
public const string ThreshAtNumPos = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtNumPos;
public const string Nmi = ClusteringEvaluator.Nmi;
public const string AvgMinScore = ClusteringEvaluator.AvgMinScore;
public const string Dbi = ClusteringEvaluator.Dbi;
}
}
}
6 changes: 3 additions & 3 deletions src/Microsoft.ML.Data/Evaluators/ClusteringEvaluator.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,9 +38,9 @@ public sealed class Arguments

public const string LoadName = "ClusteringEvaluator";

private const string Nmi = "NMI";
private const string AvgMinScore = "AvgMinScore";
private const string Dbi = "DBI";
public const string Nmi = "NMI";
public const string AvgMinScore = "AvgMinScore";
public const string Dbi = "DBI";

private readonly bool _calculateDbi;

Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.ML.Data/Evaluators/RankerEvaluator.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,9 +43,9 @@ public sealed class Arguments

public const string LoadName = "RankingEvaluator";

private const string Ndcg = "NDCG";
private const string Dcg = "DCG";
private const string MaxDcg = "MaxDCG";
public const string Ndcg = "NDCG";
public const string Dcg = "DCG";
public const string MaxDcg = "MaxDCG";

/// <summary>
/// The ranking evaluator outputs a data view by this name, which contains metrics aggregated per group.
Expand Down
, '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
Pulling metric names directly from evaluators#276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

george-microsoft
merged 1 commit into

from

May 31, 2018
 Merged


Pulling metric names directly from evaluators
#276
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


199 changes: 100 additions & 99 deletions
src/Microsoft.ML.Data/EntryPoints/InputBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.Reflection;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Internal.Utilities;
using Microsoft.ML.Runtime.Data;
using Newtonsoft.Json.Linq;

namespace Microsoft.ML.Runtime.EntryPoints.JsonUtils
Expand DownExpand Up@@ -425,81 +426,81 @@ private static object ParseJsonValue(IExceptionContext ectx, Type type, Attribut
 {
 switch (dt)
 {
 case TlcModule.DataKind.Bool:
 return value.Value<bool>();
 case TlcModule.DataKind.String:
 return value.Value<string>();
 case TlcModule.DataKind.Char:
 return value.Value<char>();
 case TlcModule.DataKind.Enum:
 if (!Enum.IsDefined(type, value.Value<string>()))
 throw ectx.Except($"Requested value '{value.Value<string>()}' is not a member of the Enum type '{type.Name}'");
 return Enum.Parse(type, value.Value<string>());
 case TlcModule.DataKind.Float:
 if (type == typeof(double))
 return value.Value<double>();
 else if (type == typeof(float))
 return value.Value<float>();
 else
 {
 case TlcModule.DataKind.Bool:
 return value.Value<bool>();
 case TlcModule.DataKind.String:
 return value.Value<string>();
 case TlcModule.DataKind.Char:
 return value.Value<char>();
 case TlcModule.DataKind.Enum:
 if (!Enum.IsDefined(type, value.Value<string>()))
 throw ectx.Except($"Requested value '{value.Value<string>()}' is not a member of the Enum type '{type.Name}'");
 return Enum.Parse(type, value.Value<string>());
 case TlcModule.DataKind.Float:
 if (type == typeof(double))
 return value.Value<double>();
 else if (type == typeof(float))
 return value.Value<float>();
 else
 {
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 }
 case TlcModule.DataKind.Array:
 var ja = value as JArray;
 ectx.Check(ja != null, "Expected array value");
 Func<IExceptionContext, JArray, Attributes, ModuleCatalog, object> makeArray = MakeArray<int>;
 return Utils.MarshalInvoke(makeArray, type.GetElementType(), ectx, ja, attributes, catalog);
 case TlcModule.DataKind.Int:
 if (type == typeof(long))
 return value.Value<long>();
 if (type == typeof(int))
 return value.Value<int>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 }
 case TlcModule.DataKind.Array:
 var ja = value as JArray;
 ectx.Check(ja != null, "Expected array value");
 Func<IExceptionContext, JArray, Attributes, ModuleCatalog, object> makeArray = MakeArray<int>;
 return Utils.MarshalInvoke(makeArray, type.GetElementType(), ectx, ja, attributes, catalog);
 case TlcModule.DataKind.Int:
 if (type == typeof(long))
 return value.Value<long>();
 if (type == typeof(int))
 return value.Value<int>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 case TlcModule.DataKind.UInt:
 if (type == typeof(ulong))
 return value.Value<ulong>();
 if (type == typeof(uint))
 return value.Value<uint>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 case TlcModule.DataKind.Dictionary:
 ectx.Check(value is JObject, "Expected object value");
 Func<IExceptionContext, JObject, Attributes, ModuleCatalog, object> makeDict = MakeDictionary<int>;
 return Utils.MarshalInvoke(makeDict, type.GetGenericArguments()[1], ectx, (JObject)value, attributes, catalog);
 case TlcModule.DataKind.Component:
 var jo = value as JObject;
 ectx.Check(jo != null, "Expected object value");
 // REVIEW: consider accepting strings alone.
 var jName = jo[FieldNames.Name];
 ectx.Check(jName != null, "Field '" + FieldNames.Name + "' is required for component.");
 ectx.Check(jName is JValue, "Expected '" + FieldNames.Name + "' field to be a string.");
 var name = jName.Value<string>();
 ectx.Check(jo[FieldNames.Settings] == null || jo[FieldNames.Settings] is JObject,
 "Expected '" + FieldNames.Settings + "' field to be an object");
 return GetComponentJson(ectx, type, name, jo[FieldNames.Settings] as JObject, catalog);
 default:
 var settings = value as JObject;
 ectx.Check(settings != null, "Expected object value");
 var inputBuilder = new InputBuilder(ectx, type, catalog);

 if (inputBuilder._fields.Length == 0)
 throw ectx.Except($"Unsupported input type: {dt}");

 if (settings != null)
 {
 foreach (var pair in settings)
 case TlcModule.DataKind.UInt:
 if (type == typeof(ulong))
 return value.Value<ulong>();
 if (type == typeof(uint))
 return value.Value<uint>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 case TlcModule.DataKind.Dictionary:
 ectx.Check(value is JObject, "Expected object value");
 Func<IExceptionContext, JObject, Attributes, ModuleCatalog, object> makeDict = MakeDictionary<int>;
 return Utils.MarshalInvoke(makeDict, type.GetGenericArguments()[1], ectx, (JObject)value, attributes, catalog);
 case TlcModule.DataKind.Component:
 var jo = value as JObject;
 ectx.Check(jo != null, "Expected object value");
 // REVIEW: consider accepting strings alone.
 var jName = jo[FieldNames.Name];
 ectx.Check(jName != null, "Field '" + FieldNames.Name + "' is required for component.");
 ectx.Check(jName is JValue, "Expected '" + FieldNames.Name + "' field to be a string.");
 var name = jName.Value<string>();
 ectx.Check(jo[FieldNames.Settings] == null || jo[FieldNames.Settings] is JObject,
 "Expected '" + FieldNames.Settings + "' field to be an object");
 return GetComponentJson(ectx, type, name, jo[FieldNames.Settings] as JObject, catalog);
 default:
 var settings = value as JObject;
 ectx.Check(settings != null, "Expected object value");
 var inputBuilder = new InputBuilder(ectx, type, catalog);

 if (inputBuilder._fields.Length == 0)
 throw ectx.Except($"Unsupported input type: {dt}");

 if (settings != null)
 {
 if (!inputBuilder.TrySetValueJson(pair.Key, pair.Value))
 throw ectx.Except($"Unexpected value for component '{type}', field '{pair.Key}': '{pair.Value}'");
 foreach (var pair in settings)
 {
 if (!inputBuilder.TrySetValueJson(pair.Key, pair.Value))
 throw ectx.Except($"Unexpected value for component '{type}', field '{pair.Key}': '{pair.Value}'");
 }
 }
 }

 var missing = inputBuilder.GetMissingValues().ToArray();
 if (missing.Length > 0)
 throw ectx.Except($"The following required inputs were not provided for component '{type}': {string.Join(", ", missing)}");
 return inputBuilder.GetInstance();
var missing = inputBuilder.GetMissingValues().ToArray();
if (missing.Length > 0)
throw ectx.Except($"The following required inputs were not provided for component '{type}': {string.Join(", ", missing)}");
return inputBuilder.GetInstance();
 }
 }
 catch (FormatException ex)
Expand DownExpand Up@@ -832,35 +833,35 @@ public static class SweepableDiscreteParam
 public static class PipelineSweeperSupportedMetrics
 {
 public new static string ToString() => "SupportedMetric";
 public const string Auc = "AUC";
 public const string AccuracyMicro = "AccuracyMicro";
 public const string AccuracyMacro = "AccuracyMacro";
 public const string F1 = "F1";
 public const string AuPrc = "AUPRC";
 public const string TopKAccuracy = "TopKAccuracy";
 public const string L1 = "L1";
 public const string L2 = "L2";
 public const string Rms = "RMS";
 public const string LossFn = "LossFn";
 public const string RSquared = "RSquared";
 public const string LogLoss = "LogLoss";
 public const string LogLossReduction = "LogLossReduction";
 public const string Ndcg = "NDCG";
 public const string Dcg = "DCG";
 public const string PositivePrecision = "PositivePrecision";
 public const string PositiveRecall = "PositiveRecall";
 public const string NegativePrecision = "NegativePrecision";
 public const string NegativeRecall = "NegativeRecall";
 public const string DrAtK = "DrAtK";
 public const string DrAtPFpr = "DrAtPFpr";
 public const string DrAtNumPos = "DrAtNumPos";
 public const string NumAnomalies = "NumAnomalies";
 public const string ThreshAtK = "ThreshAtK";
 public const string ThreshAtP = "ThreshAtP";
 public const string ThreshAtNumPos = "ThreshAtNumPos";
 public const string Nmi = "NMI";
 public const string AvgMinScore = "AvgMinScore";
 public const string Dbi = "DBI";
 public const string Auc = BinaryClassifierEvaluator.Auc;
 public const string AccuracyMicro = Data.MultiClassClassifierEvaluator.AccuracyMicro;
 public const string AccuracyMacro = MultiClassClassifierEvaluator.AccuracyMacro;
 public const string F1 = BinaryClassifierEvaluator.F1;
 public const string AuPrc = BinaryClassifierEvaluator.AuPrc;
 public const string TopKAccuracy = MultiClassClassifierEvaluator.TopKAccuracy;
 public const string L1 = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.L1;
 public const string L2 = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.L2;
 public const string Rms = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.Rms;
 public const string LossFn = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.Loss;
 public const string RSquared = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.RSquared;
 public const string LogLoss = BinaryClassifierEvaluator.LogLoss;
 public const string LogLossReduction = BinaryClassifierEvaluator.LogLossReduction;
 public const string Ndcg = RankerEvaluator.Ndcg;
 public const string Dcg = RankerEvaluator.Dcg;
 public const string PositivePrecision = BinaryClassifierEvaluator.PosPrecName;
 public const string PositiveRecall = BinaryClassifierEvaluator.PosRecallName;
 public const string NegativePrecision = BinaryClassifierEvaluator.NegPrecName;
 public const string NegativeRecall = BinaryClassifierEvaluator.NegRecallName;
 public const string DrAtK = AnomalyDetectionEvaluator.OverallMetrics.DrAtK;
 public const string DrAtPFpr = AnomalyDetectionEvaluator.OverallMetrics.DrAtPFpr;
 public const string DrAtNumPos = AnomalyDetectionEvaluator.OverallMetrics.DrAtNumPos;
 public const string NumAnomalies = AnomalyDetectionEvaluator.OverallMetrics.NumAnomalies;
 public const string ThreshAtK = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtK;
 public const string ThreshAtP = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtP;
 public const string ThreshAtNumPos = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtNumPos;
 public const string Nmi = ClusteringEvaluator.Nmi;
 public const string AvgMinScore = ClusteringEvaluator.AvgMinScore;
 public const string Dbi = ClusteringEvaluator.Dbi;
 }
 }
}

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Data/Evaluators/ClusteringEvaluator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,9 +38,9 @@ public sealed class Arguments

 public const string LoadName = "ClusteringEvaluator";

private const string Nmi = "NMI";
private const string AvgMinScore = "AvgMinScore";
private const string Dbi = "DBI";
public const string Nmi = "NMI";
public const string AvgMinScore = "AvgMinScore";
public const string Dbi = "DBI";

 private readonly bool _calculateDbi;

Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Data/Evaluators/RankerEvaluator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,9 +43,9 @@ public sealed class Arguments

 public const string LoadName = "RankingEvaluator";

private const string Ndcg = "NDCG";
private const string Dcg = "DCG";
private const string MaxDcg = "MaxDCG";
public const string Ndcg = "NDCG";
public const string Dcg = "DCG";
public const string MaxDcg = "MaxDCG";

 /// <summary>
 /// The ranking evaluator outputs a data view by this name, which contains metrics aggregated per group. 
Expand Down

, '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
Pulling metric names directly from evaluators#276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

george-microsoft
merged 1 commit into

from

May 31, 2018
 Merged


Pulling metric names directly from evaluators
#276
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


199 changes: 100 additions & 99 deletions
src/Microsoft.ML.Data/EntryPoints/InputBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.Reflection;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Internal.Utilities;
using Microsoft.ML.Runtime.Data;
using Newtonsoft.Json.Linq;

namespace Microsoft.ML.Runtime.EntryPoints.JsonUtils
Expand DownExpand Up@@ -425,81 +426,81 @@ private static object ParseJsonValue(IExceptionContext ectx, Type type, Attribut
 {
 switch (dt)
 {
 case TlcModule.DataKind.Bool:
 return value.Value<bool>();
 case TlcModule.DataKind.String:
 return value.Value<string>();
 case TlcModule.DataKind.Char:
 return value.Value<char>();
 case TlcModule.DataKind.Enum:
 if (!Enum.IsDefined(type, value.Value<string>()))
 throw ectx.Except($"Requested value '{value.Value<string>()}' is not a member of the Enum type '{type.Name}'");
 return Enum.Parse(type, value.Value<string>());
 case TlcModule.DataKind.Float:
 if (type == typeof(double))
 return value.Value<double>();
 else if (type == typeof(float))
 return value.Value<float>();
 else
 {
 case TlcModule.DataKind.Bool:
 return value.Value<bool>();
 case TlcModule.DataKind.String:
 return value.Value<string>();
 case TlcModule.DataKind.Char:
 return value.Value<char>();
 case TlcModule.DataKind.Enum:
 if (!Enum.IsDefined(type, value.Value<string>()))
 throw ectx.Except($"Requested value '{value.Value<string>()}' is not a member of the Enum type '{type.Name}'");
 return Enum.Parse(type, value.Value<string>());
 case TlcModule.DataKind.Float:
 if (type == typeof(double))
 return value.Value<double>();
 else if (type == typeof(float))
 return value.Value<float>();
 else
 {
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 }
 case TlcModule.DataKind.Array:
 var ja = value as JArray;
 ectx.Check(ja != null, "Expected array value");
 Func<IExceptionContext, JArray, Attributes, ModuleCatalog, object> makeArray = MakeArray<int>;
 return Utils.MarshalInvoke(makeArray, type.GetElementType(), ectx, ja, attributes, catalog);
 case TlcModule.DataKind.Int:
 if (type == typeof(long))
 return value.Value<long>();
 if (type == typeof(int))
 return value.Value<int>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 }
 case TlcModule.DataKind.Array:
 var ja = value as JArray;
 ectx.Check(ja != null, "Expected array value");
 Func<IExceptionContext, JArray, Attributes, ModuleCatalog, object> makeArray = MakeArray<int>;
 return Utils.MarshalInvoke(makeArray, type.GetElementType(), ectx, ja, attributes, catalog);
 case TlcModule.DataKind.Int:
 if (type == typeof(long))
 return value.Value<long>();
 if (type == typeof(int))
 return value.Value<int>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 case TlcModule.DataKind.UInt:
 if (type == typeof(ulong))
 return value.Value<ulong>();
 if (type == typeof(uint))
 return value.Value<uint>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 case TlcModule.DataKind.Dictionary:
 ectx.Check(value is JObject, "Expected object value");
 Func<IExceptionContext, JObject, Attributes, ModuleCatalog, object> makeDict = MakeDictionary<int>;
 return Utils.MarshalInvoke(makeDict, type.GetGenericArguments()[1], ectx, (JObject)value, attributes, catalog);
 case TlcModule.DataKind.Component:
 var jo = value as JObject;
 ectx.Check(jo != null, "Expected object value");
 // REVIEW: consider accepting strings alone.
 var jName = jo[FieldNames.Name];
 ectx.Check(jName != null, "Field '" + FieldNames.Name + "' is required for component.");
 ectx.Check(jName is JValue, "Expected '" + FieldNames.Name + "' field to be a string.");
 var name = jName.Value<string>();
 ectx.Check(jo[FieldNames.Settings] == null || jo[FieldNames.Settings] is JObject,
 "Expected '" + FieldNames.Settings + "' field to be an object");
 return GetComponentJson(ectx, type, name, jo[FieldNames.Settings] as JObject, catalog);
 default:
 var settings = value as JObject;
 ectx.Check(settings != null, "Expected object value");
 var inputBuilder = new InputBuilder(ectx, type, catalog);

 if (inputBuilder._fields.Length == 0)
 throw ectx.Except($"Unsupported input type: {dt}");

 if (settings != null)
 {
 foreach (var pair in settings)
 case TlcModule.DataKind.UInt:
 if (type == typeof(ulong))
 return value.Value<ulong>();
 if (type == typeof(uint))
 return value.Value<uint>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 case TlcModule.DataKind.Dictionary:
 ectx.Check(value is JObject, "Expected object value");
 Func<IExceptionContext, JObject, Attributes, ModuleCatalog, object> makeDict = MakeDictionary<int>;
 return Utils.MarshalInvoke(makeDict, type.GetGenericArguments()[1], ectx, (JObject)value, attributes, catalog);
 case TlcModule.DataKind.Component:
 var jo = value as JObject;
 ectx.Check(jo != null, "Expected object value");
 // REVIEW: consider accepting strings alone.
 var jName = jo[FieldNames.Name];
 ectx.Check(jName != null, "Field '" + FieldNames.Name + "' is required for component.");
 ectx.Check(jName is JValue, "Expected '" + FieldNames.Name + "' field to be a string.");
 var name = jName.Value<string>();
 ectx.Check(jo[FieldNames.Settings] == null || jo[FieldNames.Settings] is JObject,
 "Expected '" + FieldNames.Settings + "' field to be an object");
 return GetComponentJson(ectx, type, name, jo[FieldNames.Settings] as JObject, catalog);
 default:
 var settings = value as JObject;
 ectx.Check(settings != null, "Expected object value");
 var inputBuilder = new InputBuilder(ectx, type, catalog);

 if (inputBuilder._fields.Length == 0)
 throw ectx.Except($"Unsupported input type: {dt}");

 if (settings != null)
 {
 if (!inputBuilder.TrySetValueJson(pair.Key, pair.Value))
 throw ectx.Except($"Unexpected value for component '{type}', field '{pair.Key}': '{pair.Value}'");
 foreach (var pair in settings)
 {
 if (!inputBuilder.TrySetValueJson(pair.Key, pair.Value))
 throw ectx.Except($"Unexpected value for component '{type}', field '{pair.Key}': '{pair.Value}'");
 }
 }
 }

 var missing = inputBuilder.GetMissingValues().ToArray();
 if (missing.Length > 0)
 throw ectx.Except($"The following required inputs were not provided for component '{type}': {string.Join(", ", missing)}");
 return inputBuilder.GetInstance();
var missing = inputBuilder.GetMissingValues().ToArray();
if (missing.Length > 0)
throw ectx.Except($"The following required inputs were not provided for component '{type}': {string.Join(", ", missing)}");
return inputBuilder.GetInstance();
 }
 }
 catch (FormatException ex)
Expand DownExpand Up@@ -832,35 +833,35 @@ public static class SweepableDiscreteParam
 public static class PipelineSweeperSupportedMetrics
 {
 public new static string ToString() => "SupportedMetric";
 public const string Auc = "AUC";
 public const string AccuracyMicro = "AccuracyMicro";
 public const string AccuracyMacro = "AccuracyMacro";
 public const string F1 = "F1";
 public const string AuPrc = "AUPRC";
 public const string TopKAccuracy = "TopKAccuracy";
 public const string L1 = "L1";
 public const string L2 = "L2";
 public const string Rms = "RMS";
 public const string LossFn = "LossFn";
 public const string RSquared = "RSquared";
 public const string LogLoss = "LogLoss";
 public const string LogLossReduction = "LogLossReduction";
 public const string Ndcg = "NDCG";
 public const string Dcg = "DCG";
 public const string PositivePrecision = "PositivePrecision";
 public const string PositiveRecall = "PositiveRecall";
 public const string NegativePrecision = "NegativePrecision";
 public const string NegativeRecall = "NegativeRecall";
 public const string DrAtK = "DrAtK";
 public const string DrAtPFpr = "DrAtPFpr";
 public const string DrAtNumPos = "DrAtNumPos";
 public const string NumAnomalies = "NumAnomalies";
 public const string ThreshAtK = "ThreshAtK";
 public const string ThreshAtP = "ThreshAtP";
 public const string ThreshAtNumPos = "ThreshAtNumPos";
 public const string Nmi = "NMI";
 public const string AvgMinScore = "AvgMinScore";
 public const string Dbi = "DBI";
 public const string Auc = BinaryClassifierEvaluator.Auc;
 public const string AccuracyMicro = Data.MultiClassClassifierEvaluator.AccuracyMicro;
 public const string AccuracyMacro = MultiClassClassifierEvaluator.AccuracyMacro;
 public const string F1 = BinaryClassifierEvaluator.F1;
 public const string AuPrc = BinaryClassifierEvaluator.AuPrc;
 public const string TopKAccuracy = MultiClassClassifierEvaluator.TopKAccuracy;
 public const string L1 = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.L1;
 public const string L2 = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.L2;
 public const string Rms = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.Rms;
 public const string LossFn = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.Loss;
 public const string RSquared = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.RSquared;
 public const string LogLoss = BinaryClassifierEvaluator.LogLoss;
 public const string LogLossReduction = BinaryClassifierEvaluator.LogLossReduction;
 public const string Ndcg = RankerEvaluator.Ndcg;
 public const string Dcg = RankerEvaluator.Dcg;
 public const string PositivePrecision = BinaryClassifierEvaluator.PosPrecName;
 public const string PositiveRecall = BinaryClassifierEvaluator.PosRecallName;
 public const string NegativePrecision = BinaryClassifierEvaluator.NegPrecName;
 public const string NegativeRecall = BinaryClassifierEvaluator.NegRecallName;
 public const string DrAtK = AnomalyDetectionEvaluator.OverallMetrics.DrAtK;
 public const string DrAtPFpr = AnomalyDetectionEvaluator.OverallMetrics.DrAtPFpr;
 public const string DrAtNumPos = AnomalyDetectionEvaluator.OverallMetrics.DrAtNumPos;
 public const string NumAnomalies = AnomalyDetectionEvaluator.OverallMetrics.NumAnomalies;
 public const string ThreshAtK = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtK;
 public const string ThreshAtP = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtP;
 public const string ThreshAtNumPos = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtNumPos;
 public const string Nmi = ClusteringEvaluator.Nmi;
 public const string AvgMinScore = ClusteringEvaluator.AvgMinScore;
 public const string Dbi = ClusteringEvaluator.Dbi;
 }
 }
}

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Data/Evaluators/ClusteringEvaluator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,9 +38,9 @@ public sealed class Arguments

 public const string LoadName = "ClusteringEvaluator";

private const string Nmi = "NMI";
private const string AvgMinScore = "AvgMinScore";
private const string Dbi = "DBI";
public const string Nmi = "NMI";
public const string AvgMinScore = "AvgMinScore";
public const string Dbi = "DBI";

 private readonly bool _calculateDbi;

Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Data/Evaluators/RankerEvaluator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,9 +43,9 @@ public sealed class Arguments

 public const string LoadName = "RankingEvaluator";

private const string Ndcg = "NDCG";
private const string Dcg = "DCG";
private const string MaxDcg = "MaxDCG";
public const string Ndcg = "NDCG";
public const string Dcg = "DCG";
public const string MaxDcg = "MaxDCG";

 /// <summary>
 /// The ranking evaluator outputs a data view by this name, which contains metrics aggregated per group. 
Expand Down

, '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
Pulling metric names directly from evaluators#276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

george-microsoft
merged 1 commit into

from

May 31, 2018
 Merged


Pulling metric names directly from evaluators
#276
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


199 changes: 100 additions & 99 deletions
src/Microsoft.ML.Data/EntryPoints/InputBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.Reflection;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Internal.Utilities;
using Microsoft.ML.Runtime.Data;
using Newtonsoft.Json.Linq;

namespace Microsoft.ML.Runtime.EntryPoints.JsonUtils
Expand DownExpand Up@@ -425,81 +426,81 @@ private static object ParseJsonValue(IExceptionContext ectx, Type type, Attribut
 {
 switch (dt)
 {
 case TlcModule.DataKind.Bool:
 return value.Value<bool>();
 case TlcModule.DataKind.String:
 return value.Value<string>();
 case TlcModule.DataKind.Char:
 return value.Value<char>();
 case TlcModule.DataKind.Enum:
 if (!Enum.IsDefined(type, value.Value<string>()))
 throw ectx.Except($"Requested value '{value.Value<string>()}' is not a member of the Enum type '{type.Name}'");
 return Enum.Parse(type, value.Value<string>());
 case TlcModule.DataKind.Float:
 if (type == typeof(double))
 return value.Value<double>();
 else if (type == typeof(float))
 return value.Value<float>();
 else
 {
 case TlcModule.DataKind.Bool:
 return value.Value<bool>();
 case TlcModule.DataKind.String:
 return value.Value<string>();
 case TlcModule.DataKind.Char:
 return value.Value<char>();
 case TlcModule.DataKind.Enum:
 if (!Enum.IsDefined(type, value.Value<string>()))
 throw ectx.Except($"Requested value '{value.Value<string>()}' is not a member of the Enum type '{type.Name}'");
 return Enum.Parse(type, value.Value<string>());
 case TlcModule.DataKind.Float:
 if (type == typeof(double))
 return value.Value<double>();
 else if (type == typeof(float))
 return value.Value<float>();
 else
 {
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 }
 case TlcModule.DataKind.Array:
 var ja = value as JArray;
 ectx.Check(ja != null, "Expected array value");
 Func<IExceptionContext, JArray, Attributes, ModuleCatalog, object> makeArray = MakeArray<int>;
 return Utils.MarshalInvoke(makeArray, type.GetElementType(), ectx, ja, attributes, catalog);
 case TlcModule.DataKind.Int:
 if (type == typeof(long))
 return value.Value<long>();
 if (type == typeof(int))
 return value.Value<int>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 }
 case TlcModule.DataKind.Array:
 var ja = value as JArray;
 ectx.Check(ja != null, "Expected array value");
 Func<IExceptionContext, JArray, Attributes, ModuleCatalog, object> makeArray = MakeArray<int>;
 return Utils.MarshalInvoke(makeArray, type.GetElementType(), ectx, ja, attributes, catalog);
 case TlcModule.DataKind.Int:
 if (type == typeof(long))
 return value.Value<long>();
 if (type == typeof(int))
 return value.Value<int>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 case TlcModule.DataKind.UInt:
 if (type == typeof(ulong))
 return value.Value<ulong>();
 if (type == typeof(uint))
 return value.Value<uint>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 case TlcModule.DataKind.Dictionary:
 ectx.Check(value is JObject, "Expected object value");
 Func<IExceptionContext, JObject, Attributes, ModuleCatalog, object> makeDict = MakeDictionary<int>;
 return Utils.MarshalInvoke(makeDict, type.GetGenericArguments()[1], ectx, (JObject)value, attributes, catalog);
 case TlcModule.DataKind.Component:
 var jo = value as JObject;
 ectx.Check(jo != null, "Expected object value");
 // REVIEW: consider accepting strings alone.
 var jName = jo[FieldNames.Name];
 ectx.Check(jName != null, "Field '" + FieldNames.Name + "' is required for component.");
 ectx.Check(jName is JValue, "Expected '" + FieldNames.Name + "' field to be a string.");
 var name = jName.Value<string>();
 ectx.Check(jo[FieldNames.Settings] == null || jo[FieldNames.Settings] is JObject,
 "Expected '" + FieldNames.Settings + "' field to be an object");
 return GetComponentJson(ectx, type, name, jo[FieldNames.Settings] as JObject, catalog);
 default:
 var settings = value as JObject;
 ectx.Check(settings != null, "Expected object value");
 var inputBuilder = new InputBuilder(ectx, type, catalog);

 if (inputBuilder._fields.Length == 0)
 throw ectx.Except($"Unsupported input type: {dt}");

 if (settings != null)
 {
 foreach (var pair in settings)
 case TlcModule.DataKind.UInt:
 if (type == typeof(ulong))
 return value.Value<ulong>();
 if (type == typeof(uint))
 return value.Value<uint>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 case TlcModule.DataKind.Dictionary:
 ectx.Check(value is JObject, "Expected object value");
 Func<IExceptionContext, JObject, Attributes, ModuleCatalog, object> makeDict = MakeDictionary<int>;
 return Utils.MarshalInvoke(makeDict, type.GetGenericArguments()[1], ectx, (JObject)value, attributes, catalog);
 case TlcModule.DataKind.Component:
 var jo = value as JObject;
 ectx.Check(jo != null, "Expected object value");
 // REVIEW: consider accepting strings alone.
 var jName = jo[FieldNames.Name];
 ectx.Check(jName != null, "Field '" + FieldNames.Name + "' is required for component.");
 ectx.Check(jName is JValue, "Expected '" + FieldNames.Name + "' field to be a string.");
 var name = jName.Value<string>();
 ectx.Check(jo[FieldNames.Settings] == null || jo[FieldNames.Settings] is JObject,
 "Expected '" + FieldNames.Settings + "' field to be an object");
 return GetComponentJson(ectx, type, name, jo[FieldNames.Settings] as JObject, catalog);
 default:
 var settings = value as JObject;
 ectx.Check(settings != null, "Expected object value");
 var inputBuilder = new InputBuilder(ectx, type, catalog);

 if (inputBuilder._fields.Length == 0)
 throw ectx.Except($"Unsupported input type: {dt}");

 if (settings != null)
 {
 if (!inputBuilder.TrySetValueJson(pair.Key, pair.Value))
 throw ectx.Except($"Unexpected value for component '{type}', field '{pair.Key}': '{pair.Value}'");
 foreach (var pair in settings)
 {
 if (!inputBuilder.TrySetValueJson(pair.Key, pair.Value))
 throw ectx.Except($"Unexpected value for component '{type}', field '{pair.Key}': '{pair.Value}'");
 }
 }
 }

 var missing = inputBuilder.GetMissingValues().ToArray();
 if (missing.Length > 0)
 throw ectx.Except($"The following required inputs were not provided for component '{type}': {string.Join(", ", missing)}");
 return inputBuilder.GetInstance();
var missing = inputBuilder.GetMissingValues().ToArray();
if (missing.Length > 0)
throw ectx.Except($"The following required inputs were not provided for component '{type}': {string.Join(", ", missing)}");
return inputBuilder.GetInstance();
 }
 }
 catch (FormatException ex)
Expand DownExpand Up@@ -832,35 +833,35 @@ public static class SweepableDiscreteParam
 public static class PipelineSweeperSupportedMetrics
 {
 public new static string ToString() => "SupportedMetric";
 public const string Auc = "AUC";
 public const string AccuracyMicro = "AccuracyMicro";
 public const string AccuracyMacro = "AccuracyMacro";
 public const string F1 = "F1";
 public const string AuPrc = "AUPRC";
 public const string TopKAccuracy = "TopKAccuracy";
 public const string L1 = "L1";
 public const string L2 = "L2";
 public const string Rms = "RMS";
 public const string LossFn = "LossFn";
 public const string RSquared = "RSquared";
 public const string LogLoss = "LogLoss";
 public const string LogLossReduction = "LogLossReduction";
 public const string Ndcg = "NDCG";
 public const string Dcg = "DCG";
 public const string PositivePrecision = "PositivePrecision";
 public const string PositiveRecall = "PositiveRecall";
 public const string NegativePrecision = "NegativePrecision";
 public const string NegativeRecall = "NegativeRecall";
 public const string DrAtK = "DrAtK";
 public const string DrAtPFpr = "DrAtPFpr";
 public const string DrAtNumPos = "DrAtNumPos";
 public const string NumAnomalies = "NumAnomalies";
 public const string ThreshAtK = "ThreshAtK";
 public const string ThreshAtP = "ThreshAtP";
 public const string ThreshAtNumPos = "ThreshAtNumPos";
 public const string Nmi = "NMI";
 public const string AvgMinScore = "AvgMinScore";
 public const string Dbi = "DBI";
 public const string Auc = BinaryClassifierEvaluator.Auc;
 public const string AccuracyMicro = Data.MultiClassClassifierEvaluator.AccuracyMicro;
 public const string AccuracyMacro = MultiClassClassifierEvaluator.AccuracyMacro;
 public const string F1 = BinaryClassifierEvaluator.F1;
 public const string AuPrc = BinaryClassifierEvaluator.AuPrc;
 public const string TopKAccuracy = MultiClassClassifierEvaluator.TopKAccuracy;
 public const string L1 = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.L1;
 public const string L2 = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.L2;
 public const string Rms = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.Rms;
 public const string LossFn = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.Loss;
 public const string RSquared = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.RSquared;
 public const string LogLoss = BinaryClassifierEvaluator.LogLoss;
 public const string LogLossReduction = BinaryClassifierEvaluator.LogLossReduction;
 public const string Ndcg = RankerEvaluator.Ndcg;
 public const string Dcg = RankerEvaluator.Dcg;
 public const string PositivePrecision = BinaryClassifierEvaluator.PosPrecName;
 public const string PositiveRecall = BinaryClassifierEvaluator.PosRecallName;
 public const string NegativePrecision = BinaryClassifierEvaluator.NegPrecName;
 public const string NegativeRecall = BinaryClassifierEvaluator.NegRecallName;
 public const string DrAtK = AnomalyDetectionEvaluator.OverallMetrics.DrAtK;
 public const string DrAtPFpr = AnomalyDetectionEvaluator.OverallMetrics.DrAtPFpr;
 public const string DrAtNumPos = AnomalyDetectionEvaluator.OverallMetrics.DrAtNumPos;
 public const string NumAnomalies = AnomalyDetectionEvaluator.OverallMetrics.NumAnomalies;
 public const string ThreshAtK = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtK;
 public const string ThreshAtP = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtP;
 public const string ThreshAtNumPos = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtNumPos;
 public const string Nmi = ClusteringEvaluator.Nmi;
 public const string AvgMinScore = ClusteringEvaluator.AvgMinScore;
 public const string Dbi = ClusteringEvaluator.Dbi;
 }
 }
}

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Data/Evaluators/ClusteringEvaluator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,9 +38,9 @@ public sealed class Arguments

 public const string LoadName = "ClusteringEvaluator";

private const string Nmi = "NMI";
private const string AvgMinScore = "AvgMinScore";
private const string Dbi = "DBI";
public const string Nmi = "NMI";
public const string AvgMinScore = "AvgMinScore";
public const string Dbi = "DBI";

 private readonly bool _calculateDbi;

Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Data/Evaluators/RankerEvaluator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,9 +43,9 @@ public sealed class Arguments

 public const string LoadName = "RankingEvaluator";

private const string Ndcg = "NDCG";
private const string Dcg = "DCG";
private const string MaxDcg = "MaxDCG";
public const string Ndcg = "NDCG";
public const string Dcg = "DCG";
public const string MaxDcg = "MaxDCG";

 /// <summary>
 /// The ranking evaluator outputs a data view by this name, which contains metrics aggregated per group. 
Expand Down

, '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
Pulling metric names directly from evaluators#276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

george-microsoft
merged 1 commit into

from

May 31, 2018
 Merged


Pulling metric names directly from evaluators
#276
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


199 changes: 100 additions & 99 deletions
src/Microsoft.ML.Data/EntryPoints/InputBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.Reflection;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Internal.Utilities;
using Microsoft.ML.Runtime.Data;
using Newtonsoft.Json.Linq;

namespace Microsoft.ML.Runtime.EntryPoints.JsonUtils
Expand DownExpand Up@@ -425,81 +426,81 @@ private static object ParseJsonValue(IExceptionContext ectx, Type type, Attribut
 {
 switch (dt)
 {
 case TlcModule.DataKind.Bool:
 return value.Value<bool>();
 case TlcModule.DataKind.String:
 return value.Value<string>();
 case TlcModule.DataKind.Char:
 return value.Value<char>();
 case TlcModule.DataKind.Enum:
 if (!Enum.IsDefined(type, value.Value<string>()))
 throw ectx.Except($"Requested value '{value.Value<string>()}' is not a member of the Enum type '{type.Name}'");
 return Enum.Parse(type, value.Value<string>());
 case TlcModule.DataKind.Float:
 if (type == typeof(double))
 return value.Value<double>();
 else if (type == typeof(float))
 return value.Value<float>();
 else
 {
 case TlcModule.DataKind.Bool:
 return value.Value<bool>();
 case TlcModule.DataKind.String:
 return value.Value<string>();
 case TlcModule.DataKind.Char:
 return value.Value<char>();
 case TlcModule.DataKind.Enum:
 if (!Enum.IsDefined(type, value.Value<string>()))
 throw ectx.Except($"Requested value '{value.Value<string>()}' is not a member of the Enum type '{type.Name}'");
 return Enum.Parse(type, value.Value<string>());
 case TlcModule.DataKind.Float:
 if (type == typeof(double))
 return value.Value<double>();
 else if (type == typeof(float))
 return value.Value<float>();
 else
 {
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 }
 case TlcModule.DataKind.Array:
 var ja = value as JArray;
 ectx.Check(ja != null, "Expected array value");
 Func<IExceptionContext, JArray, Attributes, ModuleCatalog, object> makeArray = MakeArray<int>;
 return Utils.MarshalInvoke(makeArray, type.GetElementType(), ectx, ja, attributes, catalog);
 case TlcModule.DataKind.Int:
 if (type == typeof(long))
 return value.Value<long>();
 if (type == typeof(int))
 return value.Value<int>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 }
 case TlcModule.DataKind.Array:
 var ja = value as JArray;
 ectx.Check(ja != null, "Expected array value");
 Func<IExceptionContext, JArray, Attributes, ModuleCatalog, object> makeArray = MakeArray<int>;
 return Utils.MarshalInvoke(makeArray, type.GetElementType(), ectx, ja, attributes, catalog);
 case TlcModule.DataKind.Int:
 if (type == typeof(long))
 return value.Value<long>();
 if (type == typeof(int))
 return value.Value<int>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 case TlcModule.DataKind.UInt:
 if (type == typeof(ulong))
 return value.Value<ulong>();
 if (type == typeof(uint))
 return value.Value<uint>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 case TlcModule.DataKind.Dictionary:
 ectx.Check(value is JObject, "Expected object value");
 Func<IExceptionContext, JObject, Attributes, ModuleCatalog, object> makeDict = MakeDictionary<int>;
 return Utils.MarshalInvoke(makeDict, type.GetGenericArguments()[1], ectx, (JObject)value, attributes, catalog);
 case TlcModule.DataKind.Component:
 var jo = value as JObject;
 ectx.Check(jo != null, "Expected object value");
 // REVIEW: consider accepting strings alone.
 var jName = jo[FieldNames.Name];
 ectx.Check(jName != null, "Field '" + FieldNames.Name + "' is required for component.");
 ectx.Check(jName is JValue, "Expected '" + FieldNames.Name + "' field to be a string.");
 var name = jName.Value<string>();
 ectx.Check(jo[FieldNames.Settings] == null || jo[FieldNames.Settings] is JObject,
 "Expected '" + FieldNames.Settings + "' field to be an object");
 return GetComponentJson(ectx, type, name, jo[FieldNames.Settings] as JObject, catalog);
 default:
 var settings = value as JObject;
 ectx.Check(settings != null, "Expected object value");
 var inputBuilder = new InputBuilder(ectx, type, catalog);

 if (inputBuilder._fields.Length == 0)
 throw ectx.Except($"Unsupported input type: {dt}");

 if (settings != null)
 {
 foreach (var pair in settings)
 case TlcModule.DataKind.UInt:
 if (type == typeof(ulong))
 return value.Value<ulong>();
 if (type == typeof(uint))
 return value.Value<uint>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 case TlcModule.DataKind.Dictionary:
 ectx.Check(value is JObject, "Expected object value");
 Func<IExceptionContext, JObject, Attributes, ModuleCatalog, object> makeDict = MakeDictionary<int>;
 return Utils.MarshalInvoke(makeDict, type.GetGenericArguments()[1], ectx, (JObject)value, attributes, catalog);
 case TlcModule.DataKind.Component:
 var jo = value as JObject;
 ectx.Check(jo != null, "Expected object value");
 // REVIEW: consider accepting strings alone.
 var jName = jo[FieldNames.Name];
 ectx.Check(jName != null, "Field '" + FieldNames.Name + "' is required for component.");
 ectx.Check(jName is JValue, "Expected '" + FieldNames.Name + "' field to be a string.");
 var name = jName.Value<string>();
 ectx.Check(jo[FieldNames.Settings] == null || jo[FieldNames.Settings] is JObject,
 "Expected '" + FieldNames.Settings + "' field to be an object");
 return GetComponentJson(ectx, type, name, jo[FieldNames.Settings] as JObject, catalog);
 default:
 var settings = value as JObject;
 ectx.Check(settings != null, "Expected object value");
 var inputBuilder = new InputBuilder(ectx, type, catalog);

 if (inputBuilder._fields.Length == 0)
 throw ectx.Except($"Unsupported input type: {dt}");

 if (settings != null)
 {
 if (!inputBuilder.TrySetValueJson(pair.Key, pair.Value))
 throw ectx.Except($"Unexpected value for component '{type}', field '{pair.Key}': '{pair.Value}'");
 foreach (var pair in settings)
 {
 if (!inputBuilder.TrySetValueJson(pair.Key, pair.Value))
 throw ectx.Except($"Unexpected value for component '{type}', field '{pair.Key}': '{pair.Value}'");
 }
 }
 }

 var missing = inputBuilder.GetMissingValues().ToArray();
 if (missing.Length > 0)
 throw ectx.Except($"The following required inputs were not provided for component '{type}': {string.Join(", ", missing)}");
 return inputBuilder.GetInstance();
var missing = inputBuilder.GetMissingValues().ToArray();
if (missing.Length > 0)
throw ectx.Except($"The following required inputs were not provided for component '{type}': {string.Join(", ", missing)}");
return inputBuilder.GetInstance();
 }
 }
 catch (FormatException ex)
Expand DownExpand Up@@ -832,35 +833,35 @@ public static class SweepableDiscreteParam
 public static class PipelineSweeperSupportedMetrics
 {
 public new static string ToString() => "SupportedMetric";
 public const string Auc = "AUC";
 public const string AccuracyMicro = "AccuracyMicro";
 public const string AccuracyMacro = "AccuracyMacro";
 public const string F1 = "F1";
 public const string AuPrc = "AUPRC";
 public const string TopKAccuracy = "TopKAccuracy";
 public const string L1 = "L1";
 public const string L2 = "L2";
 public const string Rms = "RMS";
 public const string LossFn = "LossFn";
 public const string RSquared = "RSquared";
 public const string LogLoss = "LogLoss";
 public const string LogLossReduction = "LogLossReduction";
 public const string Ndcg = "NDCG";
 public const string Dcg = "DCG";
 public const string PositivePrecision = "PositivePrecision";
 public const string PositiveRecall = "PositiveRecall";
 public const string NegativePrecision = "NegativePrecision";
 public const string NegativeRecall = "NegativeRecall";
 public const string DrAtK = "DrAtK";
 public const string DrAtPFpr = "DrAtPFpr";
 public const string DrAtNumPos = "DrAtNumPos";
 public const string NumAnomalies = "NumAnomalies";
 public const string ThreshAtK = "ThreshAtK";
 public const string ThreshAtP = "ThreshAtP";
 public const string ThreshAtNumPos = "ThreshAtNumPos";
 public const string Nmi = "NMI";
 public const string AvgMinScore = "AvgMinScore";
 public const string Dbi = "DBI";
 public const string Auc = BinaryClassifierEvaluator.Auc;
 public const string AccuracyMicro = Data.MultiClassClassifierEvaluator.AccuracyMicro;
 public const string AccuracyMacro = MultiClassClassifierEvaluator.AccuracyMacro;
 public const string F1 = BinaryClassifierEvaluator.F1;
 public const string AuPrc = BinaryClassifierEvaluator.AuPrc;
 public const string TopKAccuracy = MultiClassClassifierEvaluator.TopKAccuracy;
 public const string L1 = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.L1;
 public const string L2 = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.L2;
 public const string Rms = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.Rms;
 public const string LossFn = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.Loss;
 public const string RSquared = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.RSquared;
 public const string LogLoss = BinaryClassifierEvaluator.LogLoss;
 public const string LogLossReduction = BinaryClassifierEvaluator.LogLossReduction;
 public const string Ndcg = RankerEvaluator.Ndcg;
 public const string Dcg = RankerEvaluator.Dcg;
 public const string PositivePrecision = BinaryClassifierEvaluator.PosPrecName;
 public const string PositiveRecall = BinaryClassifierEvaluator.PosRecallName;
 public const string NegativePrecision = BinaryClassifierEvaluator.NegPrecName;
 public const string NegativeRecall = BinaryClassifierEvaluator.NegRecallName;
 public const string DrAtK = AnomalyDetectionEvaluator.OverallMetrics.DrAtK;
 public const string DrAtPFpr = AnomalyDetectionEvaluator.OverallMetrics.DrAtPFpr;
 public const string DrAtNumPos = AnomalyDetectionEvaluator.OverallMetrics.DrAtNumPos;
 public const string NumAnomalies = AnomalyDetectionEvaluator.OverallMetrics.NumAnomalies;
 public const string ThreshAtK = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtK;
 public const string ThreshAtP = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtP;
 public const string ThreshAtNumPos = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtNumPos;
 public const string Nmi = ClusteringEvaluator.Nmi;
 public const string AvgMinScore = ClusteringEvaluator.AvgMinScore;
 public const string Dbi = ClusteringEvaluator.Dbi;
 }
 }
}

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Data/Evaluators/ClusteringEvaluator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,9 +38,9 @@ public sealed class Arguments

 public const string LoadName = "ClusteringEvaluator";

private const string Nmi = "NMI";
private const string AvgMinScore = "AvgMinScore";
private const string Dbi = "DBI";
public const string Nmi = "NMI";
public const string AvgMinScore = "AvgMinScore";
public const string Dbi = "DBI";

 private readonly bool _calculateDbi;

Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Data/Evaluators/RankerEvaluator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,9 +43,9 @@ public sealed class Arguments

 public const string LoadName = "RankingEvaluator";

private const string Ndcg = "NDCG";
private const string Dcg = "DCG";
private const string MaxDcg = "MaxDCG";
public const string Ndcg = "NDCG";
public const string Dcg = "DCG";
public const string MaxDcg = "MaxDCG";

 /// <summary>
 /// The ranking evaluator outputs a data view by this name, which contains metrics aggregated per group. 
Expand Down

, '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
Pulling metric names directly from evaluators#276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

george-microsoft
merged 1 commit into

from

May 31, 2018
 Merged


Pulling metric names directly from evaluators
#276
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


199 changes: 100 additions & 99 deletions
src/Microsoft.ML.Data/EntryPoints/InputBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.Reflection;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Internal.Utilities;
using Microsoft.ML.Runtime.Data;
using Newtonsoft.Json.Linq;

namespace Microsoft.ML.Runtime.EntryPoints.JsonUtils
Expand DownExpand Up@@ -425,81 +426,81 @@ private static object ParseJsonValue(IExceptionContext ectx, Type type, Attribut
 {
 switch (dt)
 {
 case TlcModule.DataKind.Bool:
 return value.Value<bool>();
 case TlcModule.DataKind.String:
 return value.Value<string>();
 case TlcModule.DataKind.Char:
 return value.Value<char>();
 case TlcModule.DataKind.Enum:
 if (!Enum.IsDefined(type, value.Value<string>()))
 throw ectx.Except($"Requested value '{value.Value<string>()}' is not a member of the Enum type '{type.Name}'");
 return Enum.Parse(type, value.Value<string>());
 case TlcModule.DataKind.Float:
 if (type == typeof(double))
 return value.Value<double>();
 else if (type == typeof(float))
 return value.Value<float>();
 else
 {
 case TlcModule.DataKind.Bool:
 return value.Value<bool>();
 case TlcModule.DataKind.String:
 return value.Value<string>();
 case TlcModule.DataKind.Char:
 return value.Value<char>();
 case TlcModule.DataKind.Enum:
 if (!Enum.IsDefined(type, value.Value<string>()))
 throw ectx.Except($"Requested value '{value.Value<string>()}' is not a member of the Enum type '{type.Name}'");
 return Enum.Parse(type, value.Value<string>());
 case TlcModule.DataKind.Float:
 if (type == typeof(double))
 return value.Value<double>();
 else if (type == typeof(float))
 return value.Value<float>();
 else
 {
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 }
 case TlcModule.DataKind.Array:
 var ja = value as JArray;
 ectx.Check(ja != null, "Expected array value");
 Func<IExceptionContext, JArray, Attributes, ModuleCatalog, object> makeArray = MakeArray<int>;
 return Utils.MarshalInvoke(makeArray, type.GetElementType(), ectx, ja, attributes, catalog);
 case TlcModule.DataKind.Int:
 if (type == typeof(long))
 return value.Value<long>();
 if (type == typeof(int))
 return value.Value<int>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 }
 case TlcModule.DataKind.Array:
 var ja = value as JArray;
 ectx.Check(ja != null, "Expected array value");
 Func<IExceptionContext, JArray, Attributes, ModuleCatalog, object> makeArray = MakeArray<int>;
 return Utils.MarshalInvoke(makeArray, type.GetElementType(), ectx, ja, attributes, catalog);
 case TlcModule.DataKind.Int:
 if (type == typeof(long))
 return value.Value<long>();
 if (type == typeof(int))
 return value.Value<int>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 case TlcModule.DataKind.UInt:
 if (type == typeof(ulong))
 return value.Value<ulong>();
 if (type == typeof(uint))
 return value.Value<uint>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 case TlcModule.DataKind.Dictionary:
 ectx.Check(value is JObject, "Expected object value");
 Func<IExceptionContext, JObject, Attributes, ModuleCatalog, object> makeDict = MakeDictionary<int>;
 return Utils.MarshalInvoke(makeDict, type.GetGenericArguments()[1], ectx, (JObject)value, attributes, catalog);
 case TlcModule.DataKind.Component:
 var jo = value as JObject;
 ectx.Check(jo != null, "Expected object value");
 // REVIEW: consider accepting strings alone.
 var jName = jo[FieldNames.Name];
 ectx.Check(jName != null, "Field '" + FieldNames.Name + "' is required for component.");
 ectx.Check(jName is JValue, "Expected '" + FieldNames.Name + "' field to be a string.");
 var name = jName.Value<string>();
 ectx.Check(jo[FieldNames.Settings] == null || jo[FieldNames.Settings] is JObject,
 "Expected '" + FieldNames.Settings + "' field to be an object");
 return GetComponentJson(ectx, type, name, jo[FieldNames.Settings] as JObject, catalog);
 default:
 var settings = value as JObject;
 ectx.Check(settings != null, "Expected object value");
 var inputBuilder = new InputBuilder(ectx, type, catalog);

 if (inputBuilder._fields.Length == 0)
 throw ectx.Except($"Unsupported input type: {dt}");

 if (settings != null)
 {
 foreach (var pair in settings)
 case TlcModule.DataKind.UInt:
 if (type == typeof(ulong))
 return value.Value<ulong>();
 if (type == typeof(uint))
 return value.Value<uint>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 case TlcModule.DataKind.Dictionary:
 ectx.Check(value is JObject, "Expected object value");
 Func<IExceptionContext, JObject, Attributes, ModuleCatalog, object> makeDict = MakeDictionary<int>;
 return Utils.MarshalInvoke(makeDict, type.GetGenericArguments()[1], ectx, (JObject)value, attributes, catalog);
 case TlcModule.DataKind.Component:
 var jo = value as JObject;
 ectx.Check(jo != null, "Expected object value");
 // REVIEW: consider accepting strings alone.
 var jName = jo[FieldNames.Name];
 ectx.Check(jName != null, "Field '" + FieldNames.Name + "' is required for component.");
 ectx.Check(jName is JValue, "Expected '" + FieldNames.Name + "' field to be a string.");
 var name = jName.Value<string>();
 ectx.Check(jo[FieldNames.Settings] == null || jo[FieldNames.Settings] is JObject,
 "Expected '" + FieldNames.Settings + "' field to be an object");
 return GetComponentJson(ectx, type, name, jo[FieldNames.Settings] as JObject, catalog);
 default:
 var settings = value as JObject;
 ectx.Check(settings != null, "Expected object value");
 var inputBuilder = new InputBuilder(ectx, type, catalog);

 if (inputBuilder._fields.Length == 0)
 throw ectx.Except($"Unsupported input type: {dt}");

 if (settings != null)
 {
 if (!inputBuilder.TrySetValueJson(pair.Key, pair.Value))
 throw ectx.Except($"Unexpected value for component '{type}', field '{pair.Key}': '{pair.Value}'");
 foreach (var pair in settings)
 {
 if (!inputBuilder.TrySetValueJson(pair.Key, pair.Value))
 throw ectx.Except($"Unexpected value for component '{type}', field '{pair.Key}': '{pair.Value}'");
 }
 }
 }

 var missing = inputBuilder.GetMissingValues().ToArray();
 if (missing.Length > 0)
 throw ectx.Except($"The following required inputs were not provided for component '{type}': {string.Join(", ", missing)}");
 return inputBuilder.GetInstance();
var missing = inputBuilder.GetMissingValues().ToArray();
if (missing.Length > 0)
throw ectx.Except($"The following required inputs were not provided for component '{type}': {string.Join(", ", missing)}");
return inputBuilder.GetInstance();
 }
 }
 catch (FormatException ex)
Expand DownExpand Up@@ -832,35 +833,35 @@ public static class SweepableDiscreteParam
 public static class PipelineSweeperSupportedMetrics
 {
 public new static string ToString() => "SupportedMetric";
 public const string Auc = "AUC";
 public const string AccuracyMicro = "AccuracyMicro";
 public const string AccuracyMacro = "AccuracyMacro";
 public const string F1 = "F1";
 public const string AuPrc = "AUPRC";
 public const string TopKAccuracy = "TopKAccuracy";
 public const string L1 = "L1";
 public const string L2 = "L2";
 public const string Rms = "RMS";
 public const string LossFn = "LossFn";
 public const string RSquared = "RSquared";
 public const string LogLoss = "LogLoss";
 public const string LogLossReduction = "LogLossReduction";
 public const string Ndcg = "NDCG";
 public const string Dcg = "DCG";
 public const string PositivePrecision = "PositivePrecision";
 public const string PositiveRecall = "PositiveRecall";
 public const string NegativePrecision = "NegativePrecision";
 public const string NegativeRecall = "NegativeRecall";
 public const string DrAtK = "DrAtK";
 public const string DrAtPFpr = "DrAtPFpr";
 public const string DrAtNumPos = "DrAtNumPos";
 public const string NumAnomalies = "NumAnomalies";
 public const string ThreshAtK = "ThreshAtK";
 public const string ThreshAtP = "ThreshAtP";
 public const string ThreshAtNumPos = "ThreshAtNumPos";
 public const string Nmi = "NMI";
 public const string AvgMinScore = "AvgMinScore";
 public const string Dbi = "DBI";
 public const string Auc = BinaryClassifierEvaluator.Auc;
 public const string AccuracyMicro = Data.MultiClassClassifierEvaluator.AccuracyMicro;
 public const string AccuracyMacro = MultiClassClassifierEvaluator.AccuracyMacro;
 public const string F1 = BinaryClassifierEvaluator.F1;
 public const string AuPrc = BinaryClassifierEvaluator.AuPrc;
 public const string TopKAccuracy = MultiClassClassifierEvaluator.TopKAccuracy;
 public const string L1 = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.L1;
 public const string L2 = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.L2;
 public const string Rms = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.Rms;
 public const string LossFn = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.Loss;
 public const string RSquared = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.RSquared;
 public const string LogLoss = BinaryClassifierEvaluator.LogLoss;
 public const string LogLossReduction = BinaryClassifierEvaluator.LogLossReduction;
 public const string Ndcg = RankerEvaluator.Ndcg;
 public const string Dcg = RankerEvaluator.Dcg;
 public const string PositivePrecision = BinaryClassifierEvaluator.PosPrecName;
 public const string PositiveRecall = BinaryClassifierEvaluator.PosRecallName;
 public const string NegativePrecision = BinaryClassifierEvaluator.NegPrecName;
 public const string NegativeRecall = BinaryClassifierEvaluator.NegRecallName;
 public const string DrAtK = AnomalyDetectionEvaluator.OverallMetrics.DrAtK;
 public const string DrAtPFpr = AnomalyDetectionEvaluator.OverallMetrics.DrAtPFpr;
 public const string DrAtNumPos = AnomalyDetectionEvaluator.OverallMetrics.DrAtNumPos;
 public const string NumAnomalies = AnomalyDetectionEvaluator.OverallMetrics.NumAnomalies;
 public const string ThreshAtK = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtK;
 public const string ThreshAtP = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtP;
 public const string ThreshAtNumPos = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtNumPos;
 public const string Nmi = ClusteringEvaluator.Nmi;
 public const string AvgMinScore = ClusteringEvaluator.AvgMinScore;
 public const string Dbi = ClusteringEvaluator.Dbi;
 }
 }
}

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Data/Evaluators/ClusteringEvaluator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,9 +38,9 @@ public sealed class Arguments

 public const string LoadName = "ClusteringEvaluator";

private const string Nmi = "NMI";
private const string AvgMinScore = "AvgMinScore";
private const string Dbi = "DBI";
public const string Nmi = "NMI";
public const string AvgMinScore = "AvgMinScore";
public const string Dbi = "DBI";

 private readonly bool _calculateDbi;

Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Data/Evaluators/RankerEvaluator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,9 +43,9 @@ public sealed class Arguments

 public const string LoadName = "RankingEvaluator";

private const string Ndcg = "NDCG";
private const string Dcg = "DCG";
private const string MaxDcg = "MaxDCG";
public const string Ndcg = "NDCG";
public const string Dcg = "DCG";
public const string MaxDcg = "MaxDCG";

 /// <summary>
 /// The ranking evaluator outputs a data view by this name, which contains metrics aggregated per group. 
Expand Down

, '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
Pulling metric names directly from evaluators#276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

george-microsoft
merged 1 commit into

from

May 31, 2018
 Merged


Pulling metric names directly from evaluators
#276
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


199 changes: 100 additions & 99 deletions
src/Microsoft.ML.Data/EntryPoints/InputBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.Reflection;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Internal.Utilities;
using Microsoft.ML.Runtime.Data;
using Newtonsoft.Json.Linq;

namespace Microsoft.ML.Runtime.EntryPoints.JsonUtils
Expand DownExpand Up@@ -425,81 +426,81 @@ private static object ParseJsonValue(IExceptionContext ectx, Type type, Attribut
 {
 switch (dt)
 {
 case TlcModule.DataKind.Bool:
 return value.Value<bool>();
 case TlcModule.DataKind.String:
 return value.Value<string>();
 case TlcModule.DataKind.Char:
 return value.Value<char>();
 case TlcModule.DataKind.Enum:
 if (!Enum.IsDefined(type, value.Value<string>()))
 throw ectx.Except($"Requested value '{value.Value<string>()}' is not a member of the Enum type '{type.Name}'");
 return Enum.Parse(type, value.Value<string>());
 case TlcModule.DataKind.Float:
 if (type == typeof(double))
 return value.Value<double>();
 else if (type == typeof(float))
 return value.Value<float>();
 else
 {
 case TlcModule.DataKind.Bool:
 return value.Value<bool>();
 case TlcModule.DataKind.String:
 return value.Value<string>();
 case TlcModule.DataKind.Char:
 return value.Value<char>();
 case TlcModule.DataKind.Enum:
 if (!Enum.IsDefined(type, value.Value<string>()))
 throw ectx.Except($"Requested value '{value.Value<string>()}' is not a member of the Enum type '{type.Name}'");
 return Enum.Parse(type, value.Value<string>());
 case TlcModule.DataKind.Float:
 if (type == typeof(double))
 return value.Value<double>();
 else if (type == typeof(float))
 return value.Value<float>();
 else
 {
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 }
 case TlcModule.DataKind.Array:
 var ja = value as JArray;
 ectx.Check(ja != null, "Expected array value");
 Func<IExceptionContext, JArray, Attributes, ModuleCatalog, object> makeArray = MakeArray<int>;
 return Utils.MarshalInvoke(makeArray, type.GetElementType(), ectx, ja, attributes, catalog);
 case TlcModule.DataKind.Int:
 if (type == typeof(long))
 return value.Value<long>();
 if (type == typeof(int))
 return value.Value<int>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 }
 case TlcModule.DataKind.Array:
 var ja = value as JArray;
 ectx.Check(ja != null, "Expected array value");
 Func<IExceptionContext, JArray, Attributes, ModuleCatalog, object> makeArray = MakeArray<int>;
 return Utils.MarshalInvoke(makeArray, type.GetElementType(), ectx, ja, attributes, catalog);
 case TlcModule.DataKind.Int:
 if (type == typeof(long))
 return value.Value<long>();
 if (type == typeof(int))
 return value.Value<int>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 case TlcModule.DataKind.UInt:
 if (type == typeof(ulong))
 return value.Value<ulong>();
 if (type == typeof(uint))
 return value.Value<uint>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 case TlcModule.DataKind.Dictionary:
 ectx.Check(value is JObject, "Expected object value");
 Func<IExceptionContext, JObject, Attributes, ModuleCatalog, object> makeDict = MakeDictionary<int>;
 return Utils.MarshalInvoke(makeDict, type.GetGenericArguments()[1], ectx, (JObject)value, attributes, catalog);
 case TlcModule.DataKind.Component:
 var jo = value as JObject;
 ectx.Check(jo != null, "Expected object value");
 // REVIEW: consider accepting strings alone.
 var jName = jo[FieldNames.Name];
 ectx.Check(jName != null, "Field '" + FieldNames.Name + "' is required for component.");
 ectx.Check(jName is JValue, "Expected '" + FieldNames.Name + "' field to be a string.");
 var name = jName.Value<string>();
 ectx.Check(jo[FieldNames.Settings] == null || jo[FieldNames.Settings] is JObject,
 "Expected '" + FieldNames.Settings + "' field to be an object");
 return GetComponentJson(ectx, type, name, jo[FieldNames.Settings] as JObject, catalog);
 default:
 var settings = value as JObject;
 ectx.Check(settings != null, "Expected object value");
 var inputBuilder = new InputBuilder(ectx, type, catalog);

 if (inputBuilder._fields.Length == 0)
 throw ectx.Except($"Unsupported input type: {dt}");

 if (settings != null)
 {
 foreach (var pair in settings)
 case TlcModule.DataKind.UInt:
 if (type == typeof(ulong))
 return value.Value<ulong>();
 if (type == typeof(uint))
 return value.Value<uint>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 case TlcModule.DataKind.Dictionary:
 ectx.Check(value is JObject, "Expected object value");
 Func<IExceptionContext, JObject, Attributes, ModuleCatalog, object> makeDict = MakeDictionary<int>;
 return Utils.MarshalInvoke(makeDict, type.GetGenericArguments()[1], ectx, (JObject)value, attributes, catalog);
 case TlcModule.DataKind.Component:
 var jo = value as JObject;
 ectx.Check(jo != null, "Expected object value");
 // REVIEW: consider accepting strings alone.
 var jName = jo[FieldNames.Name];
 ectx.Check(jName != null, "Field '" + FieldNames.Name + "' is required for component.");
 ectx.Check(jName is JValue, "Expected '" + FieldNames.Name + "' field to be a string.");
 var name = jName.Value<string>();
 ectx.Check(jo[FieldNames.Settings] == null || jo[FieldNames.Settings] is JObject,
 "Expected '" + FieldNames.Settings + "' field to be an object");
 return GetComponentJson(ectx, type, name, jo[FieldNames.Settings] as JObject, catalog);
 default:
 var settings = value as JObject;
 ectx.Check(settings != null, "Expected object value");
 var inputBuilder = new InputBuilder(ectx, type, catalog);

 if (inputBuilder._fields.Length == 0)
 throw ectx.Except($"Unsupported input type: {dt}");

 if (settings != null)
 {
 if (!inputBuilder.TrySetValueJson(pair.Key, pair.Value))
 throw ectx.Except($"Unexpected value for component '{type}', field '{pair.Key}': '{pair.Value}'");
 foreach (var pair in settings)
 {
 if (!inputBuilder.TrySetValueJson(pair.Key, pair.Value))
 throw ectx.Except($"Unexpected value for component '{type}', field '{pair.Key}': '{pair.Value}'");
 }
 }
 }

 var missing = inputBuilder.GetMissingValues().ToArray();
 if (missing.Length > 0)
 throw ectx.Except($"The following required inputs were not provided for component '{type}': {string.Join(", ", missing)}");
 return inputBuilder.GetInstance();
var missing = inputBuilder.GetMissingValues().ToArray();
if (missing.Length > 0)
throw ectx.Except($"The following required inputs were not provided for component '{type}': {string.Join(", ", missing)}");
return inputBuilder.GetInstance();
 }
 }
 catch (FormatException ex)
Expand DownExpand Up@@ -832,35 +833,35 @@ public static class SweepableDiscreteParam
 public static class PipelineSweeperSupportedMetrics
 {
 public new static string ToString() => "SupportedMetric";
 public const string Auc = "AUC";
 public const string AccuracyMicro = "AccuracyMicro";
 public const string AccuracyMacro = "AccuracyMacro";
 public const string F1 = "F1";
 public const string AuPrc = "AUPRC";
 public const string TopKAccuracy = "TopKAccuracy";
 public const string L1 = "L1";
 public const string L2 = "L2";
 public const string Rms = "RMS";
 public const string LossFn = "LossFn";
 public const string RSquared = "RSquared";
 public const string LogLoss = "LogLoss";
 public const string LogLossReduction = "LogLossReduction";
 public const string Ndcg = "NDCG";
 public const string Dcg = "DCG";
 public const string PositivePrecision = "PositivePrecision";
 public const string PositiveRecall = "PositiveRecall";
 public const string NegativePrecision = "NegativePrecision";
 public const string NegativeRecall = "NegativeRecall";
 public const string DrAtK = "DrAtK";
 public const string DrAtPFpr = "DrAtPFpr";
 public const string DrAtNumPos = "DrAtNumPos";
 public const string NumAnomalies = "NumAnomalies";
 public const string ThreshAtK = "ThreshAtK";
 public const string ThreshAtP = "ThreshAtP";
 public const string ThreshAtNumPos = "ThreshAtNumPos";
 public const string Nmi = "NMI";
 public const string AvgMinScore = "AvgMinScore";
 public const string Dbi = "DBI";
 public const string Auc = BinaryClassifierEvaluator.Auc;
 public const string AccuracyMicro = Data.MultiClassClassifierEvaluator.AccuracyMicro;
 public const string AccuracyMacro = MultiClassClassifierEvaluator.AccuracyMacro;
 public const string F1 = BinaryClassifierEvaluator.F1;
 public const string AuPrc = BinaryClassifierEvaluator.AuPrc;
 public const string TopKAccuracy = MultiClassClassifierEvaluator.TopKAccuracy;
 public const string L1 = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.L1;
 public const string L2 = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.L2;
 public const string Rms = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.Rms;
 public const string LossFn = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.Loss;
 public const string RSquared = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.RSquared;
 public const string LogLoss = BinaryClassifierEvaluator.LogLoss;
 public const string LogLossReduction = BinaryClassifierEvaluator.LogLossReduction;
 public const string Ndcg = RankerEvaluator.Ndcg;
 public const string Dcg = RankerEvaluator.Dcg;
 public const string PositivePrecision = BinaryClassifierEvaluator.PosPrecName;
 public const string PositiveRecall = BinaryClassifierEvaluator.PosRecallName;
 public const string NegativePrecision = BinaryClassifierEvaluator.NegPrecName;
 public const string NegativeRecall = BinaryClassifierEvaluator.NegRecallName;
 public const string DrAtK = AnomalyDetectionEvaluator.OverallMetrics.DrAtK;
 public const string DrAtPFpr = AnomalyDetectionEvaluator.OverallMetrics.DrAtPFpr;
 public const string DrAtNumPos = AnomalyDetectionEvaluator.OverallMetrics.DrAtNumPos;
 public const string NumAnomalies = AnomalyDetectionEvaluator.OverallMetrics.NumAnomalies;
 public const string ThreshAtK = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtK;
 public const string ThreshAtP = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtP;
 public const string ThreshAtNumPos = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtNumPos;
 public const string Nmi = ClusteringEvaluator.Nmi;
 public const string AvgMinScore = ClusteringEvaluator.AvgMinScore;
 public const string Dbi = ClusteringEvaluator.Dbi;
 }
 }
}

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Data/Evaluators/ClusteringEvaluator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,9 +38,9 @@ public sealed class Arguments

 public const string LoadName = "ClusteringEvaluator";

private const string Nmi = "NMI";
private const string AvgMinScore = "AvgMinScore";
private const string Dbi = "DBI";
public const string Nmi = "NMI";
public const string AvgMinScore = "AvgMinScore";
public const string Dbi = "DBI";

 private readonly bool _calculateDbi;

Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Data/Evaluators/RankerEvaluator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,9 +43,9 @@ public sealed class Arguments

 public const string LoadName = "RankingEvaluator";

private const string Ndcg = "NDCG";
private const string Dcg = "DCG";
private const string MaxDcg = "MaxDCG";
public const string Ndcg = "NDCG";
public const string Dcg = "DCG";
public const string MaxDcg = "MaxDCG";

 /// <summary>
 /// The ranking evaluator outputs a data view by this name, which contains metrics aggregated per group. 
Expand Down

, '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
Pulling metric names directly from evaluators#276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

george-microsoft
merged 1 commit into

from

May 31, 2018
 Merged


Pulling metric names directly from evaluators
#276
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


199 changes: 100 additions & 99 deletions
src/Microsoft.ML.Data/EntryPoints/InputBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
using System.Reflection;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Internal.Utilities;
using Microsoft.ML.Runtime.Data;
using Newtonsoft.Json.Linq;

namespace Microsoft.ML.Runtime.EntryPoints.JsonUtils
Expand DownExpand Up@@ -425,81 +426,81 @@ private static object ParseJsonValue(IExceptionContext ectx, Type type, Attribut
 {
 switch (dt)
 {
 case TlcModule.DataKind.Bool:
 return value.Value<bool>();
 case TlcModule.DataKind.String:
 return value.Value<string>();
 case TlcModule.DataKind.Char:
 return value.Value<char>();
 case TlcModule.DataKind.Enum:
 if (!Enum.IsDefined(type, value.Value<string>()))
 throw ectx.Except($"Requested value '{value.Value<string>()}' is not a member of the Enum type '{type.Name}'");
 return Enum.Parse(type, value.Value<string>());
 case TlcModule.DataKind.Float:
 if (type == typeof(double))
 return value.Value<double>();
 else if (type == typeof(float))
 return value.Value<float>();
 else
 {
 case TlcModule.DataKind.Bool:
 return value.Value<bool>();
 case TlcModule.DataKind.String:
 return value.Value<string>();
 case TlcModule.DataKind.Char:
 return value.Value<char>();
 case TlcModule.DataKind.Enum:
 if (!Enum.IsDefined(type, value.Value<string>()))
 throw ectx.Except($"Requested value '{value.Value<string>()}' is not a member of the Enum type '{type.Name}'");
 return Enum.Parse(type, value.Value<string>());
 case TlcModule.DataKind.Float:
 if (type == typeof(double))
 return value.Value<double>();
 else if (type == typeof(float))
 return value.Value<float>();
 else
 {
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 }
 case TlcModule.DataKind.Array:
 var ja = value as JArray;
 ectx.Check(ja != null, "Expected array value");
 Func<IExceptionContext, JArray, Attributes, ModuleCatalog, object> makeArray = MakeArray<int>;
 return Utils.MarshalInvoke(makeArray, type.GetElementType(), ectx, ja, attributes, catalog);
 case TlcModule.DataKind.Int:
 if (type == typeof(long))
 return value.Value<long>();
 if (type == typeof(int))
 return value.Value<int>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 }
 case TlcModule.DataKind.Array:
 var ja = value as JArray;
 ectx.Check(ja != null, "Expected array value");
 Func<IExceptionContext, JArray, Attributes, ModuleCatalog, object> makeArray = MakeArray<int>;
 return Utils.MarshalInvoke(makeArray, type.GetElementType(), ectx, ja, attributes, catalog);
 case TlcModule.DataKind.Int:
 if (type == typeof(long))
 return value.Value<long>();
 if (type == typeof(int))
 return value.Value<int>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 case TlcModule.DataKind.UInt:
 if (type == typeof(ulong))
 return value.Value<ulong>();
 if (type == typeof(uint))
 return value.Value<uint>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 case TlcModule.DataKind.Dictionary:
 ectx.Check(value is JObject, "Expected object value");
 Func<IExceptionContext, JObject, Attributes, ModuleCatalog, object> makeDict = MakeDictionary<int>;
 return Utils.MarshalInvoke(makeDict, type.GetGenericArguments()[1], ectx, (JObject)value, attributes, catalog);
 case TlcModule.DataKind.Component:
 var jo = value as JObject;
 ectx.Check(jo != null, "Expected object value");
 // REVIEW: consider accepting strings alone.
 var jName = jo[FieldNames.Name];
 ectx.Check(jName != null, "Field '" + FieldNames.Name + "' is required for component.");
 ectx.Check(jName is JValue, "Expected '" + FieldNames.Name + "' field to be a string.");
 var name = jName.Value<string>();
 ectx.Check(jo[FieldNames.Settings] == null || jo[FieldNames.Settings] is JObject,
 "Expected '" + FieldNames.Settings + "' field to be an object");
 return GetComponentJson(ectx, type, name, jo[FieldNames.Settings] as JObject, catalog);
 default:
 var settings = value as JObject;
 ectx.Check(settings != null, "Expected object value");
 var inputBuilder = new InputBuilder(ectx, type, catalog);

 if (inputBuilder._fields.Length == 0)
 throw ectx.Except($"Unsupported input type: {dt}");

 if (settings != null)
 {
 foreach (var pair in settings)
 case TlcModule.DataKind.UInt:
 if (type == typeof(ulong))
 return value.Value<ulong>();
 if (type == typeof(uint))
 return value.Value<uint>();
 ectx.Assert(false);
 throw ectx.ExceptNotSupp();
 case TlcModule.DataKind.Dictionary:
 ectx.Check(value is JObject, "Expected object value");
 Func<IExceptionContext, JObject, Attributes, ModuleCatalog, object> makeDict = MakeDictionary<int>;
 return Utils.MarshalInvoke(makeDict, type.GetGenericArguments()[1], ectx, (JObject)value, attributes, catalog);
 case TlcModule.DataKind.Component:
 var jo = value as JObject;
 ectx.Check(jo != null, "Expected object value");
 // REVIEW: consider accepting strings alone.
 var jName = jo[FieldNames.Name];
 ectx.Check(jName != null, "Field '" + FieldNames.Name + "' is required for component.");
 ectx.Check(jName is JValue, "Expected '" + FieldNames.Name + "' field to be a string.");
 var name = jName.Value<string>();
 ectx.Check(jo[FieldNames.Settings] == null || jo[FieldNames.Settings] is JObject,
 "Expected '" + FieldNames.Settings + "' field to be an object");
 return GetComponentJson(ectx, type, name, jo[FieldNames.Settings] as JObject, catalog);
 default:
 var settings = value as JObject;
 ectx.Check(settings != null, "Expected object value");
 var inputBuilder = new InputBuilder(ectx, type, catalog);

 if (inputBuilder._fields.Length == 0)
 throw ectx.Except($"Unsupported input type: {dt}");

 if (settings != null)
 {
 if (!inputBuilder.TrySetValueJson(pair.Key, pair.Value))
 throw ectx.Except($"Unexpected value for component '{type}', field '{pair.Key}': '{pair.Value}'");
 foreach (var pair in settings)
 {
 if (!inputBuilder.TrySetValueJson(pair.Key, pair.Value))
 throw ectx.Except($"Unexpected value for component '{type}', field '{pair.Key}': '{pair.Value}'");
 }
 }
 }

 var missing = inputBuilder.GetMissingValues().ToArray();
 if (missing.Length > 0)
 throw ectx.Except($"The following required inputs were not provided for component '{type}': {string.Join(", ", missing)}");
 return inputBuilder.GetInstance();
var missing = inputBuilder.GetMissingValues().ToArray();
if (missing.Length > 0)
throw ectx.Except($"The following required inputs were not provided for component '{type}': {string.Join(", ", missing)}");
return inputBuilder.GetInstance();
 }
 }
 catch (FormatException ex)
Expand DownExpand Up@@ -832,35 +833,35 @@ public static class SweepableDiscreteParam
 public static class PipelineSweeperSupportedMetrics
 {
 public new static string ToString() => "SupportedMetric";
 public const string Auc = "AUC";
 public const string AccuracyMicro = "AccuracyMicro";
 public const string AccuracyMacro = "AccuracyMacro";
 public const string F1 = "F1";
 public const string AuPrc = "AUPRC";
 public const string TopKAccuracy = "TopKAccuracy";
 public const string L1 = "L1";
 public const string L2 = "L2";
 public const string Rms = "RMS";
 public const string LossFn = "LossFn";
 public const string RSquared = "RSquared";
 public const string LogLoss = "LogLoss";
 public const string LogLossReduction = "LogLossReduction";
 public const string Ndcg = "NDCG";
 public const string Dcg = "DCG";
 public const string PositivePrecision = "PositivePrecision";
 public const string PositiveRecall = "PositiveRecall";
 public const string NegativePrecision = "NegativePrecision";
 public const string NegativeRecall = "NegativeRecall";
 public const string DrAtK = "DrAtK";
 public const string DrAtPFpr = "DrAtPFpr";
 public const string DrAtNumPos = "DrAtNumPos";
 public const string NumAnomalies = "NumAnomalies";
 public const string ThreshAtK = "ThreshAtK";
 public const string ThreshAtP = "ThreshAtP";
 public const string ThreshAtNumPos = "ThreshAtNumPos";
 public const string Nmi = "NMI";
 public const string AvgMinScore = "AvgMinScore";
 public const string Dbi = "DBI";
 public const string Auc = BinaryClassifierEvaluator.Auc;
 public const string AccuracyMicro = Data.MultiClassClassifierEvaluator.AccuracyMicro;
 public const string AccuracyMacro = MultiClassClassifierEvaluator.AccuracyMacro;
 public const string F1 = BinaryClassifierEvaluator.F1;
 public const string AuPrc = BinaryClassifierEvaluator.AuPrc;
 public const string TopKAccuracy = MultiClassClassifierEvaluator.TopKAccuracy;
 public const string L1 = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.L1;
 public const string L2 = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.L2;
 public const string Rms = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.Rms;
 public const string LossFn = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.Loss;
 public const string RSquared = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.RSquared;
 public const string LogLoss = BinaryClassifierEvaluator.LogLoss;
 public const string LogLossReduction = BinaryClassifierEvaluator.LogLossReduction;
 public const string Ndcg = RankerEvaluator.Ndcg;
 public const string Dcg = RankerEvaluator.Dcg;
 public const string PositivePrecision = BinaryClassifierEvaluator.PosPrecName;
 public const string PositiveRecall = BinaryClassifierEvaluator.PosRecallName;
 public const string NegativePrecision = BinaryClassifierEvaluator.NegPrecName;
 public const string NegativeRecall = BinaryClassifierEvaluator.NegRecallName;
 public const string DrAtK = AnomalyDetectionEvaluator.OverallMetrics.DrAtK;
 public const string DrAtPFpr = AnomalyDetectionEvaluator.OverallMetrics.DrAtPFpr;
 public const string DrAtNumPos = AnomalyDetectionEvaluator.OverallMetrics.DrAtNumPos;
 public const string NumAnomalies = AnomalyDetectionEvaluator.OverallMetrics.NumAnomalies;
 public const string ThreshAtK = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtK;
 public const string ThreshAtP = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtP;
 public const string ThreshAtNumPos = AnomalyDetectionEvaluator.OverallMetrics.ThreshAtNumPos;
 public const string Nmi = ClusteringEvaluator.Nmi;
 public const string AvgMinScore = ClusteringEvaluator.AvgMinScore;
 public const string Dbi = ClusteringEvaluator.Dbi;
 }
 }
}

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Data/Evaluators/ClusteringEvaluator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,9 +38,9 @@ public sealed class Arguments

 public const string LoadName = "ClusteringEvaluator";

private const string Nmi = "NMI";
private const string AvgMinScore = "AvgMinScore";
private const string Dbi = "DBI";
public const string Nmi = "NMI";
public const string AvgMinScore = "AvgMinScore";
public const string Dbi = "DBI";

 private readonly bool _calculateDbi;

Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Data/Evaluators/RankerEvaluator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,9 +43,9 @@ public sealed class Arguments

 public const string LoadName = "RankingEvaluator";

private const string Ndcg = "NDCG";
private const string Dcg = "DCG";
private const string MaxDcg = "MaxDCG";
public const string Ndcg = "NDCG";
public const string Dcg = "DCG";
public const string MaxDcg = "MaxDCG";

 /// <summary>
 /// The ranking evaluator outputs a data view by this name, which contains metrics aggregated per group. 
Expand Down