small fixes in ensembles#442

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
Ivanidzo4ka merged 4 commits into from
Jul 2, 2018
Merged

small fixes in ensembles #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8789331
separate diversity measurment by interface
Jun 27, 2018
631a45d
proper friendly name for Weighted average
Jun 27, 2018
ec6be0a
update manifest.json
Jun 27, 2018
a6cb048
missed loader signature
Jun 28, 2018
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
12 changes: 6 additions & 6 deletions src/Microsoft.ML.Ensemble/EntryPoints/DiversityMeasure.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,21 +17,21 @@
namespace Microsoft.ML.Ensemble.EntryPoints
{
[TlcModule.Component(Name = DisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
public sealed class DisagreementDiversityFactory : ISupportDiversityMeasureFactory<Single>
public sealed class DisagreementDiversityFactory : ISupportBinaryDiversityMeasureFactory
{
public IDiversityMeasure<float> CreateComponent(IHostEnvironment env) => new DisagreementDiversityMeasure();
public IBinaryDiversityMeasure CreateComponent(IHostEnvironment env) => new DisagreementDiversityMeasure();
}

[TlcModule.Component(Name = RegressionDisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
public sealed class RegressionDisagreementDiversityFactory : ISupportDiversityMeasureFactory<Single>
public sealed class RegressionDisagreementDiversityFactory : ISupportRegressionDiversityMeasureFactory
{
public IDiversityMeasure<float> CreateComponent(IHostEnvironment env) => new RegressionDisagreementDiversityMeasure();
public IRegressionDiversityMeasure CreateComponent(IHostEnvironment env) => new RegressionDisagreementDiversityMeasure();
}

[TlcModule.Component(Name = MultiDisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
public sealed class MultiDisagreementDiversityFactory : ISupportDiversityMeasureFactory<VBuffer<Single>>
public sealed class MultiDisagreementDiversityFactory : ISupportMulticlassDiversityMeasureFactory
{
public IDiversityMeasure<VBuffer<Single>> CreateComponent(IHostEnvironment env) => new MultiDisagreementDiversityMeasure();
public IMulticlassDiversityMeasure CreateComponent(IHostEnvironment env) => new MultiDisagreementDiversityMeasure();
}

}
3 changes: 1 addition & 2 deletions src/Microsoft.ML.Ensemble/OutputCombiners/IOutputCombiner.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ public interface IMultiClassOutputCombiner : IOutputCombiner<VBuffer<Single>>
{
}


[TlcModule.ComponentKind("EnsembleMulticlassOutputCombiner")]
public interface ISupportMulticlassOutputCombinerFactory : IComponentFactory<IMultiClassOutputCombiner>
{
Expand All@@ -63,7 +62,7 @@ public interface ISupportRegressionOutputCombinerFactory : IComponentFactory<IRe
{

}

public interface IWeightedAverager
{
string WeightageMetricName { get; }
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.ML.Ensemble/OutputCombiners/WeightedAverage.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ private static VersionInfo GetVersionInfo()
loaderSignature: LoaderSignature);
}

[TlcModule.Component(Name = LoadName, FriendlyName = Stacking.UserName)]
[TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
public sealed class Arguments: ISupportBinaryOutputCombinerFactory
{
[Argument(ArgumentType.AtMostOnce, HelpText = "The metric type to be used to find the weights for each model", ShortName = "wn", SortOrder = 50)]
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/DisagreementDiversityMeasure.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
public class DisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>
public class DisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>, IBinaryDiversityMeasure
{
public const string UserName = "Disagreement Diversity Measure";
public const string LoadName = "DisagreementDiversityMeasure";
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/MultiDisagreementDiversityMeasure.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
public class MultiDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<VBuffer<Single>>
public class MultiDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<VBuffer<Single>>, IMulticlassDiversityMeasure
{
public const string LoadName = "MultiDisagreementDiversityMeasure";

Expand Down
2 changes: 1 addition & 1 deletion ...Microsoft.ML.Ensemble/Selector/DiversityMeasure/RegressionDisagreementDiversityMeasure.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
public class RegressionDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>
public class RegressionDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>, IRegressionDiversityMeasure
{
public const string LoadName = "RegressionDisagreementDiversityMeasure";

Expand Down
23 changes: 21 additions & 2 deletions src/Microsoft.ML.Ensemble/Selector/IDiversityMeasure.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,10 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.EntryPoints;

Expand All@@ -17,8 +19,25 @@ List<ModelDiversityMetric<TOutput>> CalculateDiversityMeasure(IList<FeatureSubse

public delegate void SignatureEnsembleDiversityMeasure();

[TlcModule.ComponentKind("EnsembleDiversityMeasure")]
public interface ISupportDiversityMeasureFactory<TOutput> : IComponentFactory<IDiversityMeasure<TOutput>>
public interface IBinaryDiversityMeasure : IDiversityMeasure<Single>
{ }
public interface IRegressionDiversityMeasure : IDiversityMeasure<Single>
{ }
public interface IMulticlassDiversityMeasure : IDiversityMeasure<VBuffer<Single>>
{ }

[TlcModule.ComponentKind("EnsembleBinaryDiversityMeasure")]
public interface ISupportBinaryDiversityMeasureFactory : IComponentFactory<IBinaryDiversityMeasure>
{
}

[TlcModule.ComponentKind("EnsembleRegressionDiversityMeasure")]
public interface ISupportRegressionDiversityMeasureFactory : IComponentFactory<IRegressionDiversityMeasure>
{
}

[TlcModule.ComponentKind("EnsembleMulticlassDiversityMeasure")]
public interface ISupportMulticlassDiversityMeasureFactory : IComponentFactory<IMulticlassDiversityMeasure>
{
}
}
17 changes: 5 additions & 12 deletions src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseDiverseSelector.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,9 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Internal.Internallearn;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Utilities;
using Microsoft.ML.Runtime.Training;

Expand All@@ -19,27 +18,21 @@ public abstract class BaseDiverseSelector<TOutput, TDiversityMetric> : SubModelD
{
public abstract class DiverseSelectorArguments : ArgumentsBase
{
[Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
[TGUI(Label = "Diversity Measure Type")]
public ISupportDiversityMeasureFactory<TOutput> DiversityMetricType;
}

private readonly ISupportDiversityMeasureFactory<TOutput> _diversityMetricType;
private readonly IComponentFactory<IDiversityMeasure<TOutput>> _diversityMetricType;
private ConcurrentDictionary<FeatureSubsetModel<IPredictorProducing<TOutput>>, TOutput[]> _predictions;

protected abstract ISupportDiversityMeasureFactory<TOutput> DefaultDiversityMetricType { get; }

protected internal BaseDiverseSelector(IHostEnvironment env, DiverseSelectorArguments args, string name)
protected internal BaseDiverseSelector(IHostEnvironment env, DiverseSelectorArguments args, string name,
IComponentFactory<IDiversityMeasure<TOutput>> diversityMetricType)
: base(args, env, name)
{
_diversityMetricType = args.DiversityMetricType;
_diversityMetricType = diversityMetricType;
_predictions = new ConcurrentDictionary<FeatureSubsetModel<IPredictorProducing<TOutput>>, TOutput[]>();
}

protected IDiversityMeasure<TOutput> CreateDiversityMetric()
{
if (_diversityMetricType == null)
return DefaultDiversityMetricType.CreateComponent(Host);
return _diversityMetricType.CreateComponent(Host);
}

Expand Down
11 changes: 8 additions & 3 deletions src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorBinary.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,12 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorBinary), typeof(BestDiverseSelectorBinary.Arguments),
typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorBinary.UserName, BestDiverseSelectorBinary.LoadName)]
Expand All@@ -24,17 +26,20 @@ public sealed class BestDiverseSelectorBinary : BaseDiverseSelector<Single, Disa
public const string UserName = "Best Diverse Selector";
public const string LoadName = "BestDiverseSelector";

protected override ISupportDiversityMeasureFactory<Single> DefaultDiversityMetricType => new DisagreementDiversityFactory();

[TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
public sealed class Arguments : DiverseSelectorArguments, ISupportBinarySubModelSelectorFactory
{
[Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
[TGUI(Label = "Diversity Measure Type")]
public ISupportBinaryDiversityMeasureFactory DiversityMetricType = new DisagreementDiversityFactory();

public IBinarySubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorBinary(env, this);
}

public BestDiverseSelectorBinary(IHostEnvironment env, Arguments args)
: base(env, args, LoadName)
: base(env, args, LoadName, args.DiversityMetricType)
{

}

public override List<ModelDiversityMetric<Single>> CalculateDiversityMeasure(IList<FeatureSubsetModel<TScalarPredictor>> models,
Expand Down
10 changes: 7 additions & 3 deletions src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorMultiClass.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,13 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorMultiClass), typeof(BestDiverseSelectorMultiClass.Arguments),
typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorMultiClass.UserName, BestDiverseSelectorMultiClass.LoadName)]
Expand All@@ -24,16 +26,18 @@ public sealed class BestDiverseSelectorMultiClass : BaseDiverseSelector<VBuffer<
{
public const string UserName = "Best Diverse Selector";
public const string LoadName = "BestDiverseSelectorMultiClass";
protected override ISupportDiversityMeasureFactory<VBuffer<Single>> DefaultDiversityMetricType => new MultiDisagreementDiversityFactory();

[TlcModule.Component(Name = BestDiverseSelectorMultiClass.LoadName, FriendlyName = UserName)]
[TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
public sealed class Arguments : DiverseSelectorArguments, ISupportMulticlassSubModelSelectorFactory
{
[Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
[TGUI(Label = "Diversity Measure Type")]
public ISupportMulticlassDiversityMeasureFactory DiversityMetricType = new MultiDisagreementDiversityFactory();
public IMulticlassSubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorMultiClass(env, this);
}

public BestDiverseSelectorMultiClass(IHostEnvironment env, Arguments args)
: base(env, args, LoadName)
: base(env, args, LoadName, args.DiversityMetricType)
{
}

Expand Down
9 changes: 6 additions & 3 deletions src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorRegression.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,12 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorRegression), typeof(BestDiverseSelectorRegression.Arguments),
typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorRegression.UserName, BestDiverseSelectorRegression.LoadName)]
Expand All@@ -24,16 +26,17 @@ public sealed class BestDiverseSelectorRegression : BaseDiverseSelector<Single,
public const string UserName = "Best Diverse Selector";
public const string LoadName = "BestDiverseSelectorRegression";

protected override ISupportDiversityMeasureFactory<float> DefaultDiversityMetricType => new RegressionDisagreementDiversityFactory();

[TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
public sealed class Arguments : DiverseSelectorArguments, ISupportRegressionSubModelSelectorFactory
{
[Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
[TGUI(Label = "Diversity Measure Type")]
public ISupportRegressionDiversityMeasureFactory DiversityMetricType = new RegressionDisagreementDiversityFactory();
public IRegressionSubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorRegression(env, this);
}

public BestDiverseSelectorRegression(IHostEnvironment env, Arguments args)
: base(env, args, LoadName)
: base(env, args, LoadName, args.DiversityMetricType)
{
}

Expand Down
11 changes: 8 additions & 3 deletions src/Microsoft.ML.Ensemble/Trainer/Multiclass/EnsembleMultiClassPredictor.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,17 +4,22 @@

using System;
using System.Threading.Tasks;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble;
using Microsoft.ML.Runtime.Ensemble.OutputCombiners;
using Microsoft.ML.Runtime.Model;

[assembly: LoadableClass(typeof(EnsembleMultiClassPredictor), null, typeof(SignatureLoadModel),
EnsembleMultiClassPredictor.UserName, EnsembleMultiClassPredictor.LoaderSignature)]

namespace Microsoft.ML.Runtime.Ensemble
{
using TVectorPredictor = IPredictorProducing<VBuffer<Single>>;
public sealed class EnsembleMultiClassPredictor :
EnsemblePredictorBase<TVectorPredictor, VBuffer<Single>>,
IValueMapper

public sealed class EnsembleMultiClassPredictor : EnsemblePredictorBase<TVectorPredictor, VBuffer<Single>>, IValueMapper
{
public const string UserName = "Ensemble Multiclass Executor";
public const string LoaderSignature = "EnsemMcExec";
public const string RegistrationName = "EnsembleMultiClassPredictor";

Expand Down
1 change: 0 additions & 1 deletion ...Microsoft.ML.StandardLearners/FactorizationMachine/FieldAwareFactorizationMachineUtils.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,6 @@ internal static bool LoadOneExampleIntoBuffer(ValueGetter<VBuffer<float>>[] gett
}
}


internal sealed class FieldAwareFactorizationMachineScalarRowMapper : ISchemaBoundRowMapper
{
private readonly FieldAwareFactorizationMachinePredictor _pred;
Expand Down
Loading
, '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
small fixes in ensembles#442

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

Ivanidzo4ka
merged 4 commits into

from

Jul 2, 2018
 Merged


small fixes in ensembles
#442
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
8789331

separate diversity measurment by interface

Jun 27, 2018
631a45d

proper friendly name for Weighted average

Jun 27, 2018
ec6be0a

update manifest.json

Jun 27, 2018
a6cb048

missed loader signature

Jun 28, 2018

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


12 changes: 6 additions & 6 deletions
src/Microsoft.ML.Ensemble/EntryPoints/DiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,21 +17,21 @@
namespace Microsoft.ML.Ensemble.EntryPoints
{
 [TlcModule.Component(Name = DisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
 public sealed class DisagreementDiversityFactory : ISupportDiversityMeasureFactory<Single>
 public sealed class DisagreementDiversityFactory : ISupportBinaryDiversityMeasureFactory
 {
 public IDiversityMeasure<float> CreateComponent(IHostEnvironment env) => new DisagreementDiversityMeasure();
 public IBinaryDiversityMeasure CreateComponent(IHostEnvironment env) => new DisagreementDiversityMeasure();
 }

 [TlcModule.Component(Name = RegressionDisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
 public sealed class RegressionDisagreementDiversityFactory : ISupportDiversityMeasureFactory<Single>
 public sealed class RegressionDisagreementDiversityFactory : ISupportRegressionDiversityMeasureFactory
 {
 public IDiversityMeasure<float> CreateComponent(IHostEnvironment env) => new RegressionDisagreementDiversityMeasure();
 public IRegressionDiversityMeasure CreateComponent(IHostEnvironment env) => new RegressionDisagreementDiversityMeasure();
 }

 [TlcModule.Component(Name = MultiDisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
 public sealed class MultiDisagreementDiversityFactory : ISupportDiversityMeasureFactory<VBuffer<Single>>
 public sealed class MultiDisagreementDiversityFactory : ISupportMulticlassDiversityMeasureFactory
 {
 public IDiversityMeasure<VBuffer<Single>> CreateComponent(IHostEnvironment env) => new MultiDisagreementDiversityMeasure();
 public IMulticlassDiversityMeasure CreateComponent(IHostEnvironment env) => new MultiDisagreementDiversityMeasure();
 }

}

3 changes: 1 addition & 2 deletions
src/Microsoft.ML.Ensemble/OutputCombiners/IOutputCombiner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ public interface IMultiClassOutputCombiner : IOutputCombiner<VBuffer<Single>>
 {
 }


 [TlcModule.ComponentKind("EnsembleMulticlassOutputCombiner")]
 public interface ISupportMulticlassOutputCombinerFactory : IComponentFactory<IMultiClassOutputCombiner>
 {
Expand All@@ -63,7 +62,7 @@ public interface ISupportRegressionOutputCombinerFactory : IComponentFactory<IRe
 {

 }

 public interface IWeightedAverager
 {
 string WeightageMetricName { get; }
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Ensemble/OutputCombiners/WeightedAverage.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ private static VersionInfo GetVersionInfo()
 loaderSignature: LoaderSignature);
 }

 [TlcModule.Component(Name = LoadName, FriendlyName = Stacking.UserName)]
 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments: ISupportBinaryOutputCombinerFactory
 {
 [Argument(ArgumentType.AtMostOnce, HelpText = "The metric type to be used to find the weights for each model", ShortName = "wn", SortOrder = 50)]
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/DisagreementDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
 public class DisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>
 public class DisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>, IBinaryDiversityMeasure
 {
 public const string UserName = "Disagreement Diversity Measure";
 public const string LoadName = "DisagreementDiversityMeasure";
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/MultiDisagreementDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
 public class MultiDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<VBuffer<Single>>
 public class MultiDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<VBuffer<Single>>, IMulticlassDiversityMeasure
 {
 public const string LoadName = "MultiDisagreementDiversityMeasure";

Expand Down

2 changes: 1 addition & 1 deletion
...Microsoft.ML.Ensemble/Selector/DiversityMeasure/RegressionDisagreementDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
 public class RegressionDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>
 public class RegressionDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>, IRegressionDiversityMeasure
 {
 public const string LoadName = "RegressionDisagreementDiversityMeasure";

Expand Down

23 changes: 21 additions & 2 deletions
src/Microsoft.ML.Ensemble/Selector/IDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,10 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.EntryPoints;

Expand All@@ -17,8 +19,25 @@ List<ModelDiversityMetric<TOutput>> CalculateDiversityMeasure(IList<FeatureSubse

 public delegate void SignatureEnsembleDiversityMeasure();

 [TlcModule.ComponentKind("EnsembleDiversityMeasure")]
 public interface ISupportDiversityMeasureFactory<TOutput> : IComponentFactory<IDiversityMeasure<TOutput>>
 public interface IBinaryDiversityMeasure : IDiversityMeasure<Single>
 { }
 public interface IRegressionDiversityMeasure : IDiversityMeasure<Single>
 { }
 public interface IMulticlassDiversityMeasure : IDiversityMeasure<VBuffer<Single>>
 { }

 [TlcModule.ComponentKind("EnsembleBinaryDiversityMeasure")]
 public interface ISupportBinaryDiversityMeasureFactory : IComponentFactory<IBinaryDiversityMeasure>
 {
 }

 [TlcModule.ComponentKind("EnsembleRegressionDiversityMeasure")]
 public interface ISupportRegressionDiversityMeasureFactory : IComponentFactory<IRegressionDiversityMeasure>
 {
 }

 [TlcModule.ComponentKind("EnsembleMulticlassDiversityMeasure")]
 public interface ISupportMulticlassDiversityMeasureFactory : IComponentFactory<IMulticlassDiversityMeasure>
 {
 }
}

17 changes: 5 additions & 12 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseDiverseSelector.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,9 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Internal.Internallearn;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Utilities;
using Microsoft.ML.Runtime.Training;

Expand All@@ -19,27 +18,21 @@ public abstract class BaseDiverseSelector<TOutput, TDiversityMetric> : SubModelD
 {
 public abstract class DiverseSelectorArguments : ArgumentsBase
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportDiversityMeasureFactory<TOutput> DiversityMetricType;
 }

 private readonly ISupportDiversityMeasureFactory<TOutput> _diversityMetricType;
 private readonly IComponentFactory<IDiversityMeasure<TOutput>> _diversityMetricType;
 private ConcurrentDictionary<FeatureSubsetModel<IPredictorProducing<TOutput>>, TOutput[]> _predictions;

 protected abstract ISupportDiversityMeasureFactory<TOutput> DefaultDiversityMetricType { get; }

 protected internal BaseDiverseSelector(IHostEnvironment env, DiverseSelectorArguments args, string name)
 protected internal BaseDiverseSelector(IHostEnvironment env, DiverseSelectorArguments args, string name,
 IComponentFactory<IDiversityMeasure<TOutput>> diversityMetricType)
 : base(args, env, name)
 {
 _diversityMetricType = args.DiversityMetricType;
 _diversityMetricType = diversityMetricType;
 _predictions = new ConcurrentDictionary<FeatureSubsetModel<IPredictorProducing<TOutput>>, TOutput[]>();
 }

 protected IDiversityMeasure<TOutput> CreateDiversityMetric()
 {
 if (_diversityMetricType == null)
 return DefaultDiversityMetricType.CreateComponent(Host);
 return _diversityMetricType.CreateComponent(Host);
 }

Expand Down

11 changes: 8 additions & 3 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorBinary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,12 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorBinary), typeof(BestDiverseSelectorBinary.Arguments),
 typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorBinary.UserName, BestDiverseSelectorBinary.LoadName)]
Expand All@@ -24,17 +26,20 @@ public sealed class BestDiverseSelectorBinary : BaseDiverseSelector<Single, Disa
 public const string UserName = "Best Diverse Selector";
 public const string LoadName = "BestDiverseSelector";

 protected override ISupportDiversityMeasureFactory<Single> DefaultDiversityMetricType => new DisagreementDiversityFactory();

 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments : DiverseSelectorArguments, ISupportBinarySubModelSelectorFactory
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportBinaryDiversityMeasureFactory DiversityMetricType = new DisagreementDiversityFactory();

 public IBinarySubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorBinary(env, this);
 }

 public BestDiverseSelectorBinary(IHostEnvironment env, Arguments args)
 : base(env, args, LoadName)
 : base(env, args, LoadName, args.DiversityMetricType)
 {

 }

 public override List<ModelDiversityMetric<Single>> CalculateDiversityMeasure(IList<FeatureSubsetModel<TScalarPredictor>> models,
Expand Down

10 changes: 7 additions & 3 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorMultiClass.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,13 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorMultiClass), typeof(BestDiverseSelectorMultiClass.Arguments),
 typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorMultiClass.UserName, BestDiverseSelectorMultiClass.LoadName)]
Expand All@@ -24,16 +26,18 @@ public sealed class BestDiverseSelectorMultiClass : BaseDiverseSelector<VBuffer<
 {
 public const string UserName = "Best Diverse Selector";
 public const string LoadName = "BestDiverseSelectorMultiClass";
 protected override ISupportDiversityMeasureFactory<VBuffer<Single>> DefaultDiversityMetricType => new MultiDisagreementDiversityFactory();

 [TlcModule.Component(Name = BestDiverseSelectorMultiClass.LoadName, FriendlyName = UserName)]
 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments : DiverseSelectorArguments, ISupportMulticlassSubModelSelectorFactory
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportMulticlassDiversityMeasureFactory DiversityMetricType = new MultiDisagreementDiversityFactory();
 public IMulticlassSubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorMultiClass(env, this);
 }

 public BestDiverseSelectorMultiClass(IHostEnvironment env, Arguments args)
 : base(env, args, LoadName)
 : base(env, args, LoadName, args.DiversityMetricType)
 {
 }

Expand Down

9 changes: 6 additions & 3 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorRegression.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,12 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorRegression), typeof(BestDiverseSelectorRegression.Arguments),
 typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorRegression.UserName, BestDiverseSelectorRegression.LoadName)]
Expand All@@ -24,16 +26,17 @@ public sealed class BestDiverseSelectorRegression : BaseDiverseSelector<Single,
 public const string UserName = "Best Diverse Selector";
 public const string LoadName = "BestDiverseSelectorRegression";

 protected override ISupportDiversityMeasureFactory<float> DefaultDiversityMetricType => new RegressionDisagreementDiversityFactory();

 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments : DiverseSelectorArguments, ISupportRegressionSubModelSelectorFactory
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportRegressionDiversityMeasureFactory DiversityMetricType = new RegressionDisagreementDiversityFactory();
 public IRegressionSubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorRegression(env, this);
 }

 public BestDiverseSelectorRegression(IHostEnvironment env, Arguments args)
 : base(env, args, LoadName)
 : base(env, args, LoadName, args.DiversityMetricType)
 {
 }

Expand Down

11 changes: 8 additions & 3 deletions
src/Microsoft.ML.Ensemble/Trainer/Multiclass/EnsembleMultiClassPredictor.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,17 +4,22 @@

using System;
using System.Threading.Tasks;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble;
using Microsoft.ML.Runtime.Ensemble.OutputCombiners;
using Microsoft.ML.Runtime.Model;

[assembly: LoadableClass(typeof(EnsembleMultiClassPredictor), null, typeof(SignatureLoadModel),
 EnsembleMultiClassPredictor.UserName, EnsembleMultiClassPredictor.LoaderSignature)]

namespace Microsoft.ML.Runtime.Ensemble
{
 using TVectorPredictor = IPredictorProducing<VBuffer<Single>>;
 public sealed class EnsembleMultiClassPredictor :
 EnsemblePredictorBase<TVectorPredictor, VBuffer<Single>>,
 IValueMapper

 public sealed class EnsembleMultiClassPredictor : EnsemblePredictorBase<TVectorPredictor, VBuffer<Single>>, IValueMapper
 {
 public const string UserName = "Ensemble Multiclass Executor";
 public const string LoaderSignature = "EnsemMcExec";
 public const string RegistrationName = "EnsembleMultiClassPredictor";

Expand Down

1 change: 0 additions & 1 deletion
...Microsoft.ML.StandardLearners/FactorizationMachine/FieldAwareFactorizationMachineUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,6 @@ internal static bool LoadOneExampleIntoBuffer(ValueGetter<VBuffer<float>>[] gett
 }
 }


 internal sealed class FieldAwareFactorizationMachineScalarRowMapper : ISchemaBoundRowMapper
 {
 private readonly FieldAwareFactorizationMachinePredictor _pred;
Expand Down
Loading

, '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
small fixes in ensembles#442

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

Ivanidzo4ka
merged 4 commits into

from

Jul 2, 2018
 Merged


small fixes in ensembles
#442
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
8789331

separate diversity measurment by interface

Jun 27, 2018
631a45d

proper friendly name for Weighted average

Jun 27, 2018
ec6be0a

update manifest.json

Jun 27, 2018
a6cb048

missed loader signature

Jun 28, 2018

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


12 changes: 6 additions & 6 deletions
src/Microsoft.ML.Ensemble/EntryPoints/DiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,21 +17,21 @@
namespace Microsoft.ML.Ensemble.EntryPoints
{
 [TlcModule.Component(Name = DisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
 public sealed class DisagreementDiversityFactory : ISupportDiversityMeasureFactory<Single>
 public sealed class DisagreementDiversityFactory : ISupportBinaryDiversityMeasureFactory
 {
 public IDiversityMeasure<float> CreateComponent(IHostEnvironment env) => new DisagreementDiversityMeasure();
 public IBinaryDiversityMeasure CreateComponent(IHostEnvironment env) => new DisagreementDiversityMeasure();
 }

 [TlcModule.Component(Name = RegressionDisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
 public sealed class RegressionDisagreementDiversityFactory : ISupportDiversityMeasureFactory<Single>
 public sealed class RegressionDisagreementDiversityFactory : ISupportRegressionDiversityMeasureFactory
 {
 public IDiversityMeasure<float> CreateComponent(IHostEnvironment env) => new RegressionDisagreementDiversityMeasure();
 public IRegressionDiversityMeasure CreateComponent(IHostEnvironment env) => new RegressionDisagreementDiversityMeasure();
 }

 [TlcModule.Component(Name = MultiDisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
 public sealed class MultiDisagreementDiversityFactory : ISupportDiversityMeasureFactory<VBuffer<Single>>
 public sealed class MultiDisagreementDiversityFactory : ISupportMulticlassDiversityMeasureFactory
 {
 public IDiversityMeasure<VBuffer<Single>> CreateComponent(IHostEnvironment env) => new MultiDisagreementDiversityMeasure();
 public IMulticlassDiversityMeasure CreateComponent(IHostEnvironment env) => new MultiDisagreementDiversityMeasure();
 }

}

3 changes: 1 addition & 2 deletions
src/Microsoft.ML.Ensemble/OutputCombiners/IOutputCombiner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ public interface IMultiClassOutputCombiner : IOutputCombiner<VBuffer<Single>>
 {
 }


 [TlcModule.ComponentKind("EnsembleMulticlassOutputCombiner")]
 public interface ISupportMulticlassOutputCombinerFactory : IComponentFactory<IMultiClassOutputCombiner>
 {
Expand All@@ -63,7 +62,7 @@ public interface ISupportRegressionOutputCombinerFactory : IComponentFactory<IRe
 {

 }

 public interface IWeightedAverager
 {
 string WeightageMetricName { get; }
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Ensemble/OutputCombiners/WeightedAverage.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ private static VersionInfo GetVersionInfo()
 loaderSignature: LoaderSignature);
 }

 [TlcModule.Component(Name = LoadName, FriendlyName = Stacking.UserName)]
 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments: ISupportBinaryOutputCombinerFactory
 {
 [Argument(ArgumentType.AtMostOnce, HelpText = "The metric type to be used to find the weights for each model", ShortName = "wn", SortOrder = 50)]
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/DisagreementDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
 public class DisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>
 public class DisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>, IBinaryDiversityMeasure
 {
 public const string UserName = "Disagreement Diversity Measure";
 public const string LoadName = "DisagreementDiversityMeasure";
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/MultiDisagreementDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
 public class MultiDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<VBuffer<Single>>
 public class MultiDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<VBuffer<Single>>, IMulticlassDiversityMeasure
 {
 public const string LoadName = "MultiDisagreementDiversityMeasure";

Expand Down

2 changes: 1 addition & 1 deletion
...Microsoft.ML.Ensemble/Selector/DiversityMeasure/RegressionDisagreementDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
 public class RegressionDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>
 public class RegressionDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>, IRegressionDiversityMeasure
 {
 public const string LoadName = "RegressionDisagreementDiversityMeasure";

Expand Down

23 changes: 21 additions & 2 deletions
src/Microsoft.ML.Ensemble/Selector/IDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,10 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.EntryPoints;

Expand All@@ -17,8 +19,25 @@ List<ModelDiversityMetric<TOutput>> CalculateDiversityMeasure(IList<FeatureSubse

 public delegate void SignatureEnsembleDiversityMeasure();

 [TlcModule.ComponentKind("EnsembleDiversityMeasure")]
 public interface ISupportDiversityMeasureFactory<TOutput> : IComponentFactory<IDiversityMeasure<TOutput>>
 public interface IBinaryDiversityMeasure : IDiversityMeasure<Single>
 { }
 public interface IRegressionDiversityMeasure : IDiversityMeasure<Single>
 { }
 public interface IMulticlassDiversityMeasure : IDiversityMeasure<VBuffer<Single>>
 { }

 [TlcModule.ComponentKind("EnsembleBinaryDiversityMeasure")]
 public interface ISupportBinaryDiversityMeasureFactory : IComponentFactory<IBinaryDiversityMeasure>
 {
 }

 [TlcModule.ComponentKind("EnsembleRegressionDiversityMeasure")]
 public interface ISupportRegressionDiversityMeasureFactory : IComponentFactory<IRegressionDiversityMeasure>
 {
 }

 [TlcModule.ComponentKind("EnsembleMulticlassDiversityMeasure")]
 public interface ISupportMulticlassDiversityMeasureFactory : IComponentFactory<IMulticlassDiversityMeasure>
 {
 }
}

17 changes: 5 additions & 12 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseDiverseSelector.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,9 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Internal.Internallearn;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Utilities;
using Microsoft.ML.Runtime.Training;

Expand All@@ -19,27 +18,21 @@ public abstract class BaseDiverseSelector<TOutput, TDiversityMetric> : SubModelD
 {
 public abstract class DiverseSelectorArguments : ArgumentsBase
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportDiversityMeasureFactory<TOutput> DiversityMetricType;
 }

 private readonly ISupportDiversityMeasureFactory<TOutput> _diversityMetricType;
 private readonly IComponentFactory<IDiversityMeasure<TOutput>> _diversityMetricType;
 private ConcurrentDictionary<FeatureSubsetModel<IPredictorProducing<TOutput>>, TOutput[]> _predictions;

 protected abstract ISupportDiversityMeasureFactory<TOutput> DefaultDiversityMetricType { get; }

 protected internal BaseDiverseSelector(IHostEnvironment env, DiverseSelectorArguments args, string name)
 protected internal BaseDiverseSelector(IHostEnvironment env, DiverseSelectorArguments args, string name,
 IComponentFactory<IDiversityMeasure<TOutput>> diversityMetricType)
 : base(args, env, name)
 {
 _diversityMetricType = args.DiversityMetricType;
 _diversityMetricType = diversityMetricType;
 _predictions = new ConcurrentDictionary<FeatureSubsetModel<IPredictorProducing<TOutput>>, TOutput[]>();
 }

 protected IDiversityMeasure<TOutput> CreateDiversityMetric()
 {
 if (_diversityMetricType == null)
 return DefaultDiversityMetricType.CreateComponent(Host);
 return _diversityMetricType.CreateComponent(Host);
 }

Expand Down

11 changes: 8 additions & 3 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorBinary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,12 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorBinary), typeof(BestDiverseSelectorBinary.Arguments),
 typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorBinary.UserName, BestDiverseSelectorBinary.LoadName)]
Expand All@@ -24,17 +26,20 @@ public sealed class BestDiverseSelectorBinary : BaseDiverseSelector<Single, Disa
 public const string UserName = "Best Diverse Selector";
 public const string LoadName = "BestDiverseSelector";

 protected override ISupportDiversityMeasureFactory<Single> DefaultDiversityMetricType => new DisagreementDiversityFactory();

 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments : DiverseSelectorArguments, ISupportBinarySubModelSelectorFactory
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportBinaryDiversityMeasureFactory DiversityMetricType = new DisagreementDiversityFactory();

 public IBinarySubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorBinary(env, this);
 }

 public BestDiverseSelectorBinary(IHostEnvironment env, Arguments args)
 : base(env, args, LoadName)
 : base(env, args, LoadName, args.DiversityMetricType)
 {

 }

 public override List<ModelDiversityMetric<Single>> CalculateDiversityMeasure(IList<FeatureSubsetModel<TScalarPredictor>> models,
Expand Down

10 changes: 7 additions & 3 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorMultiClass.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,13 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorMultiClass), typeof(BestDiverseSelectorMultiClass.Arguments),
 typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorMultiClass.UserName, BestDiverseSelectorMultiClass.LoadName)]
Expand All@@ -24,16 +26,18 @@ public sealed class BestDiverseSelectorMultiClass : BaseDiverseSelector<VBuffer<
 {
 public const string UserName = "Best Diverse Selector";
 public const string LoadName = "BestDiverseSelectorMultiClass";
 protected override ISupportDiversityMeasureFactory<VBuffer<Single>> DefaultDiversityMetricType => new MultiDisagreementDiversityFactory();

 [TlcModule.Component(Name = BestDiverseSelectorMultiClass.LoadName, FriendlyName = UserName)]
 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments : DiverseSelectorArguments, ISupportMulticlassSubModelSelectorFactory
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportMulticlassDiversityMeasureFactory DiversityMetricType = new MultiDisagreementDiversityFactory();
 public IMulticlassSubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorMultiClass(env, this);
 }

 public BestDiverseSelectorMultiClass(IHostEnvironment env, Arguments args)
 : base(env, args, LoadName)
 : base(env, args, LoadName, args.DiversityMetricType)
 {
 }

Expand Down

9 changes: 6 additions & 3 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorRegression.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,12 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorRegression), typeof(BestDiverseSelectorRegression.Arguments),
 typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorRegression.UserName, BestDiverseSelectorRegression.LoadName)]
Expand All@@ -24,16 +26,17 @@ public sealed class BestDiverseSelectorRegression : BaseDiverseSelector<Single,
 public const string UserName = "Best Diverse Selector";
 public const string LoadName = "BestDiverseSelectorRegression";

 protected override ISupportDiversityMeasureFactory<float> DefaultDiversityMetricType => new RegressionDisagreementDiversityFactory();

 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments : DiverseSelectorArguments, ISupportRegressionSubModelSelectorFactory
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportRegressionDiversityMeasureFactory DiversityMetricType = new RegressionDisagreementDiversityFactory();
 public IRegressionSubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorRegression(env, this);
 }

 public BestDiverseSelectorRegression(IHostEnvironment env, Arguments args)
 : base(env, args, LoadName)
 : base(env, args, LoadName, args.DiversityMetricType)
 {
 }

Expand Down

11 changes: 8 additions & 3 deletions
src/Microsoft.ML.Ensemble/Trainer/Multiclass/EnsembleMultiClassPredictor.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,17 +4,22 @@

using System;
using System.Threading.Tasks;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble;
using Microsoft.ML.Runtime.Ensemble.OutputCombiners;
using Microsoft.ML.Runtime.Model;

[assembly: LoadableClass(typeof(EnsembleMultiClassPredictor), null, typeof(SignatureLoadModel),
 EnsembleMultiClassPredictor.UserName, EnsembleMultiClassPredictor.LoaderSignature)]

namespace Microsoft.ML.Runtime.Ensemble
{
 using TVectorPredictor = IPredictorProducing<VBuffer<Single>>;
 public sealed class EnsembleMultiClassPredictor :
 EnsemblePredictorBase<TVectorPredictor, VBuffer<Single>>,
 IValueMapper

 public sealed class EnsembleMultiClassPredictor : EnsemblePredictorBase<TVectorPredictor, VBuffer<Single>>, IValueMapper
 {
 public const string UserName = "Ensemble Multiclass Executor";
 public const string LoaderSignature = "EnsemMcExec";
 public const string RegistrationName = "EnsembleMultiClassPredictor";

Expand Down

1 change: 0 additions & 1 deletion
...Microsoft.ML.StandardLearners/FactorizationMachine/FieldAwareFactorizationMachineUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,6 @@ internal static bool LoadOneExampleIntoBuffer(ValueGetter<VBuffer<float>>[] gett
 }
 }


 internal sealed class FieldAwareFactorizationMachineScalarRowMapper : ISchemaBoundRowMapper
 {
 private readonly FieldAwareFactorizationMachinePredictor _pred;
Expand Down
Loading

, '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
small fixes in ensembles#442

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

Ivanidzo4ka
merged 4 commits into

from

Jul 2, 2018
 Merged


small fixes in ensembles
#442
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
8789331

separate diversity measurment by interface

Jun 27, 2018
631a45d

proper friendly name for Weighted average

Jun 27, 2018
ec6be0a

update manifest.json

Jun 27, 2018
a6cb048

missed loader signature

Jun 28, 2018

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


12 changes: 6 additions & 6 deletions
src/Microsoft.ML.Ensemble/EntryPoints/DiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,21 +17,21 @@
namespace Microsoft.ML.Ensemble.EntryPoints
{
 [TlcModule.Component(Name = DisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
 public sealed class DisagreementDiversityFactory : ISupportDiversityMeasureFactory<Single>
 public sealed class DisagreementDiversityFactory : ISupportBinaryDiversityMeasureFactory
 {
 public IDiversityMeasure<float> CreateComponent(IHostEnvironment env) => new DisagreementDiversityMeasure();
 public IBinaryDiversityMeasure CreateComponent(IHostEnvironment env) => new DisagreementDiversityMeasure();
 }

 [TlcModule.Component(Name = RegressionDisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
 public sealed class RegressionDisagreementDiversityFactory : ISupportDiversityMeasureFactory<Single>
 public sealed class RegressionDisagreementDiversityFactory : ISupportRegressionDiversityMeasureFactory
 {
 public IDiversityMeasure<float> CreateComponent(IHostEnvironment env) => new RegressionDisagreementDiversityMeasure();
 public IRegressionDiversityMeasure CreateComponent(IHostEnvironment env) => new RegressionDisagreementDiversityMeasure();
 }

 [TlcModule.Component(Name = MultiDisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
 public sealed class MultiDisagreementDiversityFactory : ISupportDiversityMeasureFactory<VBuffer<Single>>
 public sealed class MultiDisagreementDiversityFactory : ISupportMulticlassDiversityMeasureFactory
 {
 public IDiversityMeasure<VBuffer<Single>> CreateComponent(IHostEnvironment env) => new MultiDisagreementDiversityMeasure();
 public IMulticlassDiversityMeasure CreateComponent(IHostEnvironment env) => new MultiDisagreementDiversityMeasure();
 }

}

3 changes: 1 addition & 2 deletions
src/Microsoft.ML.Ensemble/OutputCombiners/IOutputCombiner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ public interface IMultiClassOutputCombiner : IOutputCombiner<VBuffer<Single>>
 {
 }


 [TlcModule.ComponentKind("EnsembleMulticlassOutputCombiner")]
 public interface ISupportMulticlassOutputCombinerFactory : IComponentFactory<IMultiClassOutputCombiner>
 {
Expand All@@ -63,7 +62,7 @@ public interface ISupportRegressionOutputCombinerFactory : IComponentFactory<IRe
 {

 }

 public interface IWeightedAverager
 {
 string WeightageMetricName { get; }
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Ensemble/OutputCombiners/WeightedAverage.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ private static VersionInfo GetVersionInfo()
 loaderSignature: LoaderSignature);
 }

 [TlcModule.Component(Name = LoadName, FriendlyName = Stacking.UserName)]
 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments: ISupportBinaryOutputCombinerFactory
 {
 [Argument(ArgumentType.AtMostOnce, HelpText = "The metric type to be used to find the weights for each model", ShortName = "wn", SortOrder = 50)]
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/DisagreementDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
 public class DisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>
 public class DisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>, IBinaryDiversityMeasure
 {
 public const string UserName = "Disagreement Diversity Measure";
 public const string LoadName = "DisagreementDiversityMeasure";
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/MultiDisagreementDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
 public class MultiDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<VBuffer<Single>>
 public class MultiDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<VBuffer<Single>>, IMulticlassDiversityMeasure
 {
 public const string LoadName = "MultiDisagreementDiversityMeasure";

Expand Down

2 changes: 1 addition & 1 deletion
...Microsoft.ML.Ensemble/Selector/DiversityMeasure/RegressionDisagreementDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
 public class RegressionDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>
 public class RegressionDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>, IRegressionDiversityMeasure
 {
 public const string LoadName = "RegressionDisagreementDiversityMeasure";

Expand Down

23 changes: 21 additions & 2 deletions
src/Microsoft.ML.Ensemble/Selector/IDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,10 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.EntryPoints;

Expand All@@ -17,8 +19,25 @@ List<ModelDiversityMetric<TOutput>> CalculateDiversityMeasure(IList<FeatureSubse

 public delegate void SignatureEnsembleDiversityMeasure();

 [TlcModule.ComponentKind("EnsembleDiversityMeasure")]
 public interface ISupportDiversityMeasureFactory<TOutput> : IComponentFactory<IDiversityMeasure<TOutput>>
 public interface IBinaryDiversityMeasure : IDiversityMeasure<Single>
 { }
 public interface IRegressionDiversityMeasure : IDiversityMeasure<Single>
 { }
 public interface IMulticlassDiversityMeasure : IDiversityMeasure<VBuffer<Single>>
 { }

 [TlcModule.ComponentKind("EnsembleBinaryDiversityMeasure")]
 public interface ISupportBinaryDiversityMeasureFactory : IComponentFactory<IBinaryDiversityMeasure>
 {
 }

 [TlcModule.ComponentKind("EnsembleRegressionDiversityMeasure")]
 public interface ISupportRegressionDiversityMeasureFactory : IComponentFactory<IRegressionDiversityMeasure>
 {
 }

 [TlcModule.ComponentKind("EnsembleMulticlassDiversityMeasure")]
 public interface ISupportMulticlassDiversityMeasureFactory : IComponentFactory<IMulticlassDiversityMeasure>
 {
 }
}

17 changes: 5 additions & 12 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseDiverseSelector.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,9 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Internal.Internallearn;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Utilities;
using Microsoft.ML.Runtime.Training;

Expand All@@ -19,27 +18,21 @@ public abstract class BaseDiverseSelector<TOutput, TDiversityMetric> : SubModelD
 {
 public abstract class DiverseSelectorArguments : ArgumentsBase
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportDiversityMeasureFactory<TOutput> DiversityMetricType;
 }

 private readonly ISupportDiversityMeasureFactory<TOutput> _diversityMetricType;
 private readonly IComponentFactory<IDiversityMeasure<TOutput>> _diversityMetricType;
 private ConcurrentDictionary<FeatureSubsetModel<IPredictorProducing<TOutput>>, TOutput[]> _predictions;

 protected abstract ISupportDiversityMeasureFactory<TOutput> DefaultDiversityMetricType { get; }

 protected internal BaseDiverseSelector(IHostEnvironment env, DiverseSelectorArguments args, string name)
 protected internal BaseDiverseSelector(IHostEnvironment env, DiverseSelectorArguments args, string name,
 IComponentFactory<IDiversityMeasure<TOutput>> diversityMetricType)
 : base(args, env, name)
 {
 _diversityMetricType = args.DiversityMetricType;
 _diversityMetricType = diversityMetricType;
 _predictions = new ConcurrentDictionary<FeatureSubsetModel<IPredictorProducing<TOutput>>, TOutput[]>();
 }

 protected IDiversityMeasure<TOutput> CreateDiversityMetric()
 {
 if (_diversityMetricType == null)
 return DefaultDiversityMetricType.CreateComponent(Host);
 return _diversityMetricType.CreateComponent(Host);
 }

Expand Down

11 changes: 8 additions & 3 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorBinary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,12 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorBinary), typeof(BestDiverseSelectorBinary.Arguments),
 typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorBinary.UserName, BestDiverseSelectorBinary.LoadName)]
Expand All@@ -24,17 +26,20 @@ public sealed class BestDiverseSelectorBinary : BaseDiverseSelector<Single, Disa
 public const string UserName = "Best Diverse Selector";
 public const string LoadName = "BestDiverseSelector";

 protected override ISupportDiversityMeasureFactory<Single> DefaultDiversityMetricType => new DisagreementDiversityFactory();

 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments : DiverseSelectorArguments, ISupportBinarySubModelSelectorFactory
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportBinaryDiversityMeasureFactory DiversityMetricType = new DisagreementDiversityFactory();

 public IBinarySubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorBinary(env, this);
 }

 public BestDiverseSelectorBinary(IHostEnvironment env, Arguments args)
 : base(env, args, LoadName)
 : base(env, args, LoadName, args.DiversityMetricType)
 {

 }

 public override List<ModelDiversityMetric<Single>> CalculateDiversityMeasure(IList<FeatureSubsetModel<TScalarPredictor>> models,
Expand Down

10 changes: 7 additions & 3 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorMultiClass.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,13 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorMultiClass), typeof(BestDiverseSelectorMultiClass.Arguments),
 typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorMultiClass.UserName, BestDiverseSelectorMultiClass.LoadName)]
Expand All@@ -24,16 +26,18 @@ public sealed class BestDiverseSelectorMultiClass : BaseDiverseSelector<VBuffer<
 {
 public const string UserName = "Best Diverse Selector";
 public const string LoadName = "BestDiverseSelectorMultiClass";
 protected override ISupportDiversityMeasureFactory<VBuffer<Single>> DefaultDiversityMetricType => new MultiDisagreementDiversityFactory();

 [TlcModule.Component(Name = BestDiverseSelectorMultiClass.LoadName, FriendlyName = UserName)]
 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments : DiverseSelectorArguments, ISupportMulticlassSubModelSelectorFactory
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportMulticlassDiversityMeasureFactory DiversityMetricType = new MultiDisagreementDiversityFactory();
 public IMulticlassSubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorMultiClass(env, this);
 }

 public BestDiverseSelectorMultiClass(IHostEnvironment env, Arguments args)
 : base(env, args, LoadName)
 : base(env, args, LoadName, args.DiversityMetricType)
 {
 }

Expand Down

9 changes: 6 additions & 3 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorRegression.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,12 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorRegression), typeof(BestDiverseSelectorRegression.Arguments),
 typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorRegression.UserName, BestDiverseSelectorRegression.LoadName)]
Expand All@@ -24,16 +26,17 @@ public sealed class BestDiverseSelectorRegression : BaseDiverseSelector<Single,
 public const string UserName = "Best Diverse Selector";
 public const string LoadName = "BestDiverseSelectorRegression";

 protected override ISupportDiversityMeasureFactory<float> DefaultDiversityMetricType => new RegressionDisagreementDiversityFactory();

 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments : DiverseSelectorArguments, ISupportRegressionSubModelSelectorFactory
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportRegressionDiversityMeasureFactory DiversityMetricType = new RegressionDisagreementDiversityFactory();
 public IRegressionSubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorRegression(env, this);
 }

 public BestDiverseSelectorRegression(IHostEnvironment env, Arguments args)
 : base(env, args, LoadName)
 : base(env, args, LoadName, args.DiversityMetricType)
 {
 }

Expand Down

11 changes: 8 additions & 3 deletions
src/Microsoft.ML.Ensemble/Trainer/Multiclass/EnsembleMultiClassPredictor.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,17 +4,22 @@

using System;
using System.Threading.Tasks;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble;
using Microsoft.ML.Runtime.Ensemble.OutputCombiners;
using Microsoft.ML.Runtime.Model;

[assembly: LoadableClass(typeof(EnsembleMultiClassPredictor), null, typeof(SignatureLoadModel),
 EnsembleMultiClassPredictor.UserName, EnsembleMultiClassPredictor.LoaderSignature)]

namespace Microsoft.ML.Runtime.Ensemble
{
 using TVectorPredictor = IPredictorProducing<VBuffer<Single>>;
 public sealed class EnsembleMultiClassPredictor :
 EnsemblePredictorBase<TVectorPredictor, VBuffer<Single>>,
 IValueMapper

 public sealed class EnsembleMultiClassPredictor : EnsemblePredictorBase<TVectorPredictor, VBuffer<Single>>, IValueMapper
 {
 public const string UserName = "Ensemble Multiclass Executor";
 public const string LoaderSignature = "EnsemMcExec";
 public const string RegistrationName = "EnsembleMultiClassPredictor";

Expand Down

1 change: 0 additions & 1 deletion
...Microsoft.ML.StandardLearners/FactorizationMachine/FieldAwareFactorizationMachineUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,6 @@ internal static bool LoadOneExampleIntoBuffer(ValueGetter<VBuffer<float>>[] gett
 }
 }


 internal sealed class FieldAwareFactorizationMachineScalarRowMapper : ISchemaBoundRowMapper
 {
 private readonly FieldAwareFactorizationMachinePredictor _pred;
Expand Down
Loading

, '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
small fixes in ensembles#442

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

Ivanidzo4ka
merged 4 commits into

from

Jul 2, 2018
 Merged


small fixes in ensembles
#442
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
8789331

separate diversity measurment by interface

Jun 27, 2018
631a45d

proper friendly name for Weighted average

Jun 27, 2018
ec6be0a

update manifest.json

Jun 27, 2018
a6cb048

missed loader signature

Jun 28, 2018

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


12 changes: 6 additions & 6 deletions
src/Microsoft.ML.Ensemble/EntryPoints/DiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,21 +17,21 @@
namespace Microsoft.ML.Ensemble.EntryPoints
{
 [TlcModule.Component(Name = DisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
 public sealed class DisagreementDiversityFactory : ISupportDiversityMeasureFactory<Single>
 public sealed class DisagreementDiversityFactory : ISupportBinaryDiversityMeasureFactory
 {
 public IDiversityMeasure<float> CreateComponent(IHostEnvironment env) => new DisagreementDiversityMeasure();
 public IBinaryDiversityMeasure CreateComponent(IHostEnvironment env) => new DisagreementDiversityMeasure();
 }

 [TlcModule.Component(Name = RegressionDisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
 public sealed class RegressionDisagreementDiversityFactory : ISupportDiversityMeasureFactory<Single>
 public sealed class RegressionDisagreementDiversityFactory : ISupportRegressionDiversityMeasureFactory
 {
 public IDiversityMeasure<float> CreateComponent(IHostEnvironment env) => new RegressionDisagreementDiversityMeasure();
 public IRegressionDiversityMeasure CreateComponent(IHostEnvironment env) => new RegressionDisagreementDiversityMeasure();
 }

 [TlcModule.Component(Name = MultiDisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
 public sealed class MultiDisagreementDiversityFactory : ISupportDiversityMeasureFactory<VBuffer<Single>>
 public sealed class MultiDisagreementDiversityFactory : ISupportMulticlassDiversityMeasureFactory
 {
 public IDiversityMeasure<VBuffer<Single>> CreateComponent(IHostEnvironment env) => new MultiDisagreementDiversityMeasure();
 public IMulticlassDiversityMeasure CreateComponent(IHostEnvironment env) => new MultiDisagreementDiversityMeasure();
 }

}

3 changes: 1 addition & 2 deletions
src/Microsoft.ML.Ensemble/OutputCombiners/IOutputCombiner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ public interface IMultiClassOutputCombiner : IOutputCombiner<VBuffer<Single>>
 {
 }


 [TlcModule.ComponentKind("EnsembleMulticlassOutputCombiner")]
 public interface ISupportMulticlassOutputCombinerFactory : IComponentFactory<IMultiClassOutputCombiner>
 {
Expand All@@ -63,7 +62,7 @@ public interface ISupportRegressionOutputCombinerFactory : IComponentFactory<IRe
 {

 }

 public interface IWeightedAverager
 {
 string WeightageMetricName { get; }
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Ensemble/OutputCombiners/WeightedAverage.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ private static VersionInfo GetVersionInfo()
 loaderSignature: LoaderSignature);
 }

 [TlcModule.Component(Name = LoadName, FriendlyName = Stacking.UserName)]
 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments: ISupportBinaryOutputCombinerFactory
 {
 [Argument(ArgumentType.AtMostOnce, HelpText = "The metric type to be used to find the weights for each model", ShortName = "wn", SortOrder = 50)]
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/DisagreementDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
 public class DisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>
 public class DisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>, IBinaryDiversityMeasure
 {
 public const string UserName = "Disagreement Diversity Measure";
 public const string LoadName = "DisagreementDiversityMeasure";
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/MultiDisagreementDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
 public class MultiDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<VBuffer<Single>>
 public class MultiDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<VBuffer<Single>>, IMulticlassDiversityMeasure
 {
 public const string LoadName = "MultiDisagreementDiversityMeasure";

Expand Down

2 changes: 1 addition & 1 deletion
...Microsoft.ML.Ensemble/Selector/DiversityMeasure/RegressionDisagreementDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
 public class RegressionDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>
 public class RegressionDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>, IRegressionDiversityMeasure
 {
 public const string LoadName = "RegressionDisagreementDiversityMeasure";

Expand Down

23 changes: 21 additions & 2 deletions
src/Microsoft.ML.Ensemble/Selector/IDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,10 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.EntryPoints;

Expand All@@ -17,8 +19,25 @@ List<ModelDiversityMetric<TOutput>> CalculateDiversityMeasure(IList<FeatureSubse

 public delegate void SignatureEnsembleDiversityMeasure();

 [TlcModule.ComponentKind("EnsembleDiversityMeasure")]
 public interface ISupportDiversityMeasureFactory<TOutput> : IComponentFactory<IDiversityMeasure<TOutput>>
 public interface IBinaryDiversityMeasure : IDiversityMeasure<Single>
 { }
 public interface IRegressionDiversityMeasure : IDiversityMeasure<Single>
 { }
 public interface IMulticlassDiversityMeasure : IDiversityMeasure<VBuffer<Single>>
 { }

 [TlcModule.ComponentKind("EnsembleBinaryDiversityMeasure")]
 public interface ISupportBinaryDiversityMeasureFactory : IComponentFactory<IBinaryDiversityMeasure>
 {
 }

 [TlcModule.ComponentKind("EnsembleRegressionDiversityMeasure")]
 public interface ISupportRegressionDiversityMeasureFactory : IComponentFactory<IRegressionDiversityMeasure>
 {
 }

 [TlcModule.ComponentKind("EnsembleMulticlassDiversityMeasure")]
 public interface ISupportMulticlassDiversityMeasureFactory : IComponentFactory<IMulticlassDiversityMeasure>
 {
 }
}

17 changes: 5 additions & 12 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseDiverseSelector.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,9 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Internal.Internallearn;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Utilities;
using Microsoft.ML.Runtime.Training;

Expand All@@ -19,27 +18,21 @@ public abstract class BaseDiverseSelector<TOutput, TDiversityMetric> : SubModelD
 {
 public abstract class DiverseSelectorArguments : ArgumentsBase
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportDiversityMeasureFactory<TOutput> DiversityMetricType;
 }

 private readonly ISupportDiversityMeasureFactory<TOutput> _diversityMetricType;
 private readonly IComponentFactory<IDiversityMeasure<TOutput>> _diversityMetricType;
 private ConcurrentDictionary<FeatureSubsetModel<IPredictorProducing<TOutput>>, TOutput[]> _predictions;

 protected abstract ISupportDiversityMeasureFactory<TOutput> DefaultDiversityMetricType { get; }

 protected internal BaseDiverseSelector(IHostEnvironment env, DiverseSelectorArguments args, string name)
 protected internal BaseDiverseSelector(IHostEnvironment env, DiverseSelectorArguments args, string name,
 IComponentFactory<IDiversityMeasure<TOutput>> diversityMetricType)
 : base(args, env, name)
 {
 _diversityMetricType = args.DiversityMetricType;
 _diversityMetricType = diversityMetricType;
 _predictions = new ConcurrentDictionary<FeatureSubsetModel<IPredictorProducing<TOutput>>, TOutput[]>();
 }

 protected IDiversityMeasure<TOutput> CreateDiversityMetric()
 {
 if (_diversityMetricType == null)
 return DefaultDiversityMetricType.CreateComponent(Host);
 return _diversityMetricType.CreateComponent(Host);
 }

Expand Down

11 changes: 8 additions & 3 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorBinary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,12 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorBinary), typeof(BestDiverseSelectorBinary.Arguments),
 typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorBinary.UserName, BestDiverseSelectorBinary.LoadName)]
Expand All@@ -24,17 +26,20 @@ public sealed class BestDiverseSelectorBinary : BaseDiverseSelector<Single, Disa
 public const string UserName = "Best Diverse Selector";
 public const string LoadName = "BestDiverseSelector";

 protected override ISupportDiversityMeasureFactory<Single> DefaultDiversityMetricType => new DisagreementDiversityFactory();

 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments : DiverseSelectorArguments, ISupportBinarySubModelSelectorFactory
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportBinaryDiversityMeasureFactory DiversityMetricType = new DisagreementDiversityFactory();

 public IBinarySubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorBinary(env, this);
 }

 public BestDiverseSelectorBinary(IHostEnvironment env, Arguments args)
 : base(env, args, LoadName)
 : base(env, args, LoadName, args.DiversityMetricType)
 {

 }

 public override List<ModelDiversityMetric<Single>> CalculateDiversityMeasure(IList<FeatureSubsetModel<TScalarPredictor>> models,
Expand Down

10 changes: 7 additions & 3 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorMultiClass.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,13 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorMultiClass), typeof(BestDiverseSelectorMultiClass.Arguments),
 typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorMultiClass.UserName, BestDiverseSelectorMultiClass.LoadName)]
Expand All@@ -24,16 +26,18 @@ public sealed class BestDiverseSelectorMultiClass : BaseDiverseSelector<VBuffer<
 {
 public const string UserName = "Best Diverse Selector";
 public const string LoadName = "BestDiverseSelectorMultiClass";
 protected override ISupportDiversityMeasureFactory<VBuffer<Single>> DefaultDiversityMetricType => new MultiDisagreementDiversityFactory();

 [TlcModule.Component(Name = BestDiverseSelectorMultiClass.LoadName, FriendlyName = UserName)]
 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments : DiverseSelectorArguments, ISupportMulticlassSubModelSelectorFactory
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportMulticlassDiversityMeasureFactory DiversityMetricType = new MultiDisagreementDiversityFactory();
 public IMulticlassSubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorMultiClass(env, this);
 }

 public BestDiverseSelectorMultiClass(IHostEnvironment env, Arguments args)
 : base(env, args, LoadName)
 : base(env, args, LoadName, args.DiversityMetricType)
 {
 }

Expand Down

9 changes: 6 additions & 3 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorRegression.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,12 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorRegression), typeof(BestDiverseSelectorRegression.Arguments),
 typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorRegression.UserName, BestDiverseSelectorRegression.LoadName)]
Expand All@@ -24,16 +26,17 @@ public sealed class BestDiverseSelectorRegression : BaseDiverseSelector<Single,
 public const string UserName = "Best Diverse Selector";
 public const string LoadName = "BestDiverseSelectorRegression";

 protected override ISupportDiversityMeasureFactory<float> DefaultDiversityMetricType => new RegressionDisagreementDiversityFactory();

 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments : DiverseSelectorArguments, ISupportRegressionSubModelSelectorFactory
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportRegressionDiversityMeasureFactory DiversityMetricType = new RegressionDisagreementDiversityFactory();
 public IRegressionSubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorRegression(env, this);
 }

 public BestDiverseSelectorRegression(IHostEnvironment env, Arguments args)
 : base(env, args, LoadName)
 : base(env, args, LoadName, args.DiversityMetricType)
 {
 }

Expand Down

11 changes: 8 additions & 3 deletions
src/Microsoft.ML.Ensemble/Trainer/Multiclass/EnsembleMultiClassPredictor.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,17 +4,22 @@

using System;
using System.Threading.Tasks;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble;
using Microsoft.ML.Runtime.Ensemble.OutputCombiners;
using Microsoft.ML.Runtime.Model;

[assembly: LoadableClass(typeof(EnsembleMultiClassPredictor), null, typeof(SignatureLoadModel),
 EnsembleMultiClassPredictor.UserName, EnsembleMultiClassPredictor.LoaderSignature)]

namespace Microsoft.ML.Runtime.Ensemble
{
 using TVectorPredictor = IPredictorProducing<VBuffer<Single>>;
 public sealed class EnsembleMultiClassPredictor :
 EnsemblePredictorBase<TVectorPredictor, VBuffer<Single>>,
 IValueMapper

 public sealed class EnsembleMultiClassPredictor : EnsemblePredictorBase<TVectorPredictor, VBuffer<Single>>, IValueMapper
 {
 public const string UserName = "Ensemble Multiclass Executor";
 public const string LoaderSignature = "EnsemMcExec";
 public const string RegistrationName = "EnsembleMultiClassPredictor";

Expand Down

1 change: 0 additions & 1 deletion
...Microsoft.ML.StandardLearners/FactorizationMachine/FieldAwareFactorizationMachineUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,6 @@ internal static bool LoadOneExampleIntoBuffer(ValueGetter<VBuffer<float>>[] gett
 }
 }


 internal sealed class FieldAwareFactorizationMachineScalarRowMapper : ISchemaBoundRowMapper
 {
 private readonly FieldAwareFactorizationMachinePredictor _pred;
Expand Down
Loading

, '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
small fixes in ensembles#442

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

Ivanidzo4ka
merged 4 commits into

from

Jul 2, 2018
 Merged


small fixes in ensembles
#442
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
8789331

separate diversity measurment by interface

Jun 27, 2018
631a45d

proper friendly name for Weighted average

Jun 27, 2018
ec6be0a

update manifest.json

Jun 27, 2018
a6cb048

missed loader signature

Jun 28, 2018

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


12 changes: 6 additions & 6 deletions
src/Microsoft.ML.Ensemble/EntryPoints/DiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,21 +17,21 @@
namespace Microsoft.ML.Ensemble.EntryPoints
{
 [TlcModule.Component(Name = DisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
 public sealed class DisagreementDiversityFactory : ISupportDiversityMeasureFactory<Single>
 public sealed class DisagreementDiversityFactory : ISupportBinaryDiversityMeasureFactory
 {
 public IDiversityMeasure<float> CreateComponent(IHostEnvironment env) => new DisagreementDiversityMeasure();
 public IBinaryDiversityMeasure CreateComponent(IHostEnvironment env) => new DisagreementDiversityMeasure();
 }

 [TlcModule.Component(Name = RegressionDisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
 public sealed class RegressionDisagreementDiversityFactory : ISupportDiversityMeasureFactory<Single>
 public sealed class RegressionDisagreementDiversityFactory : ISupportRegressionDiversityMeasureFactory
 {
 public IDiversityMeasure<float> CreateComponent(IHostEnvironment env) => new RegressionDisagreementDiversityMeasure();
 public IRegressionDiversityMeasure CreateComponent(IHostEnvironment env) => new RegressionDisagreementDiversityMeasure();
 }

 [TlcModule.Component(Name = MultiDisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
 public sealed class MultiDisagreementDiversityFactory : ISupportDiversityMeasureFactory<VBuffer<Single>>
 public sealed class MultiDisagreementDiversityFactory : ISupportMulticlassDiversityMeasureFactory
 {
 public IDiversityMeasure<VBuffer<Single>> CreateComponent(IHostEnvironment env) => new MultiDisagreementDiversityMeasure();
 public IMulticlassDiversityMeasure CreateComponent(IHostEnvironment env) => new MultiDisagreementDiversityMeasure();
 }

}

3 changes: 1 addition & 2 deletions
src/Microsoft.ML.Ensemble/OutputCombiners/IOutputCombiner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ public interface IMultiClassOutputCombiner : IOutputCombiner<VBuffer<Single>>
 {
 }


 [TlcModule.ComponentKind("EnsembleMulticlassOutputCombiner")]
 public interface ISupportMulticlassOutputCombinerFactory : IComponentFactory<IMultiClassOutputCombiner>
 {
Expand All@@ -63,7 +62,7 @@ public interface ISupportRegressionOutputCombinerFactory : IComponentFactory<IRe
 {

 }

 public interface IWeightedAverager
 {
 string WeightageMetricName { get; }
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Ensemble/OutputCombiners/WeightedAverage.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ private static VersionInfo GetVersionInfo()
 loaderSignature: LoaderSignature);
 }

 [TlcModule.Component(Name = LoadName, FriendlyName = Stacking.UserName)]
 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments: ISupportBinaryOutputCombinerFactory
 {
 [Argument(ArgumentType.AtMostOnce, HelpText = "The metric type to be used to find the weights for each model", ShortName = "wn", SortOrder = 50)]
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/DisagreementDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
 public class DisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>
 public class DisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>, IBinaryDiversityMeasure
 {
 public const string UserName = "Disagreement Diversity Measure";
 public const string LoadName = "DisagreementDiversityMeasure";
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/MultiDisagreementDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
 public class MultiDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<VBuffer<Single>>
 public class MultiDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<VBuffer<Single>>, IMulticlassDiversityMeasure
 {
 public const string LoadName = "MultiDisagreementDiversityMeasure";

Expand Down

2 changes: 1 addition & 1 deletion
...Microsoft.ML.Ensemble/Selector/DiversityMeasure/RegressionDisagreementDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
 public class RegressionDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>
 public class RegressionDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>, IRegressionDiversityMeasure
 {
 public const string LoadName = "RegressionDisagreementDiversityMeasure";

Expand Down

23 changes: 21 additions & 2 deletions
src/Microsoft.ML.Ensemble/Selector/IDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,10 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.EntryPoints;

Expand All@@ -17,8 +19,25 @@ List<ModelDiversityMetric<TOutput>> CalculateDiversityMeasure(IList<FeatureSubse

 public delegate void SignatureEnsembleDiversityMeasure();

 [TlcModule.ComponentKind("EnsembleDiversityMeasure")]
 public interface ISupportDiversityMeasureFactory<TOutput> : IComponentFactory<IDiversityMeasure<TOutput>>
 public interface IBinaryDiversityMeasure : IDiversityMeasure<Single>
 { }
 public interface IRegressionDiversityMeasure : IDiversityMeasure<Single>
 { }
 public interface IMulticlassDiversityMeasure : IDiversityMeasure<VBuffer<Single>>
 { }

 [TlcModule.ComponentKind("EnsembleBinaryDiversityMeasure")]
 public interface ISupportBinaryDiversityMeasureFactory : IComponentFactory<IBinaryDiversityMeasure>
 {
 }

 [TlcModule.ComponentKind("EnsembleRegressionDiversityMeasure")]
 public interface ISupportRegressionDiversityMeasureFactory : IComponentFactory<IRegressionDiversityMeasure>
 {
 }

 [TlcModule.ComponentKind("EnsembleMulticlassDiversityMeasure")]
 public interface ISupportMulticlassDiversityMeasureFactory : IComponentFactory<IMulticlassDiversityMeasure>
 {
 }
}

17 changes: 5 additions & 12 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseDiverseSelector.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,9 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Internal.Internallearn;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Utilities;
using Microsoft.ML.Runtime.Training;

Expand All@@ -19,27 +18,21 @@ public abstract class BaseDiverseSelector<TOutput, TDiversityMetric> : SubModelD
 {
 public abstract class DiverseSelectorArguments : ArgumentsBase
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportDiversityMeasureFactory<TOutput> DiversityMetricType;
 }

 private readonly ISupportDiversityMeasureFactory<TOutput> _diversityMetricType;
 private readonly IComponentFactory<IDiversityMeasure<TOutput>> _diversityMetricType;
 private ConcurrentDictionary<FeatureSubsetModel<IPredictorProducing<TOutput>>, TOutput[]> _predictions;

 protected abstract ISupportDiversityMeasureFactory<TOutput> DefaultDiversityMetricType { get; }

 protected internal BaseDiverseSelector(IHostEnvironment env, DiverseSelectorArguments args, string name)
 protected internal BaseDiverseSelector(IHostEnvironment env, DiverseSelectorArguments args, string name,
 IComponentFactory<IDiversityMeasure<TOutput>> diversityMetricType)
 : base(args, env, name)
 {
 _diversityMetricType = args.DiversityMetricType;
 _diversityMetricType = diversityMetricType;
 _predictions = new ConcurrentDictionary<FeatureSubsetModel<IPredictorProducing<TOutput>>, TOutput[]>();
 }

 protected IDiversityMeasure<TOutput> CreateDiversityMetric()
 {
 if (_diversityMetricType == null)
 return DefaultDiversityMetricType.CreateComponent(Host);
 return _diversityMetricType.CreateComponent(Host);
 }

Expand Down

11 changes: 8 additions & 3 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorBinary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,12 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorBinary), typeof(BestDiverseSelectorBinary.Arguments),
 typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorBinary.UserName, BestDiverseSelectorBinary.LoadName)]
Expand All@@ -24,17 +26,20 @@ public sealed class BestDiverseSelectorBinary : BaseDiverseSelector<Single, Disa
 public const string UserName = "Best Diverse Selector";
 public const string LoadName = "BestDiverseSelector";

 protected override ISupportDiversityMeasureFactory<Single> DefaultDiversityMetricType => new DisagreementDiversityFactory();

 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments : DiverseSelectorArguments, ISupportBinarySubModelSelectorFactory
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportBinaryDiversityMeasureFactory DiversityMetricType = new DisagreementDiversityFactory();

 public IBinarySubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorBinary(env, this);
 }

 public BestDiverseSelectorBinary(IHostEnvironment env, Arguments args)
 : base(env, args, LoadName)
 : base(env, args, LoadName, args.DiversityMetricType)
 {

 }

 public override List<ModelDiversityMetric<Single>> CalculateDiversityMeasure(IList<FeatureSubsetModel<TScalarPredictor>> models,
Expand Down

10 changes: 7 additions & 3 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorMultiClass.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,13 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorMultiClass), typeof(BestDiverseSelectorMultiClass.Arguments),
 typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorMultiClass.UserName, BestDiverseSelectorMultiClass.LoadName)]
Expand All@@ -24,16 +26,18 @@ public sealed class BestDiverseSelectorMultiClass : BaseDiverseSelector<VBuffer<
 {
 public const string UserName = "Best Diverse Selector";
 public const string LoadName = "BestDiverseSelectorMultiClass";
 protected override ISupportDiversityMeasureFactory<VBuffer<Single>> DefaultDiversityMetricType => new MultiDisagreementDiversityFactory();

 [TlcModule.Component(Name = BestDiverseSelectorMultiClass.LoadName, FriendlyName = UserName)]
 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments : DiverseSelectorArguments, ISupportMulticlassSubModelSelectorFactory
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportMulticlassDiversityMeasureFactory DiversityMetricType = new MultiDisagreementDiversityFactory();
 public IMulticlassSubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorMultiClass(env, this);
 }

 public BestDiverseSelectorMultiClass(IHostEnvironment env, Arguments args)
 : base(env, args, LoadName)
 : base(env, args, LoadName, args.DiversityMetricType)
 {
 }

Expand Down

9 changes: 6 additions & 3 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorRegression.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,12 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorRegression), typeof(BestDiverseSelectorRegression.Arguments),
 typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorRegression.UserName, BestDiverseSelectorRegression.LoadName)]
Expand All@@ -24,16 +26,17 @@ public sealed class BestDiverseSelectorRegression : BaseDiverseSelector<Single,
 public const string UserName = "Best Diverse Selector";
 public const string LoadName = "BestDiverseSelectorRegression";

 protected override ISupportDiversityMeasureFactory<float> DefaultDiversityMetricType => new RegressionDisagreementDiversityFactory();

 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments : DiverseSelectorArguments, ISupportRegressionSubModelSelectorFactory
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportRegressionDiversityMeasureFactory DiversityMetricType = new RegressionDisagreementDiversityFactory();
 public IRegressionSubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorRegression(env, this);
 }

 public BestDiverseSelectorRegression(IHostEnvironment env, Arguments args)
 : base(env, args, LoadName)
 : base(env, args, LoadName, args.DiversityMetricType)
 {
 }

Expand Down

11 changes: 8 additions & 3 deletions
src/Microsoft.ML.Ensemble/Trainer/Multiclass/EnsembleMultiClassPredictor.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,17 +4,22 @@

using System;
using System.Threading.Tasks;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble;
using Microsoft.ML.Runtime.Ensemble.OutputCombiners;
using Microsoft.ML.Runtime.Model;

[assembly: LoadableClass(typeof(EnsembleMultiClassPredictor), null, typeof(SignatureLoadModel),
 EnsembleMultiClassPredictor.UserName, EnsembleMultiClassPredictor.LoaderSignature)]

namespace Microsoft.ML.Runtime.Ensemble
{
 using TVectorPredictor = IPredictorProducing<VBuffer<Single>>;
 public sealed class EnsembleMultiClassPredictor :
 EnsemblePredictorBase<TVectorPredictor, VBuffer<Single>>,
 IValueMapper

 public sealed class EnsembleMultiClassPredictor : EnsemblePredictorBase<TVectorPredictor, VBuffer<Single>>, IValueMapper
 {
 public const string UserName = "Ensemble Multiclass Executor";
 public const string LoaderSignature = "EnsemMcExec";
 public const string RegistrationName = "EnsembleMultiClassPredictor";

Expand Down

1 change: 0 additions & 1 deletion
...Microsoft.ML.StandardLearners/FactorizationMachine/FieldAwareFactorizationMachineUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,6 @@ internal static bool LoadOneExampleIntoBuffer(ValueGetter<VBuffer<float>>[] gett
 }
 }


 internal sealed class FieldAwareFactorizationMachineScalarRowMapper : ISchemaBoundRowMapper
 {
 private readonly FieldAwareFactorizationMachinePredictor _pred;
Expand Down
Loading

, '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
small fixes in ensembles#442

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

Ivanidzo4ka
merged 4 commits into

from

Jul 2, 2018
 Merged


small fixes in ensembles
#442
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
8789331

separate diversity measurment by interface

Jun 27, 2018
631a45d

proper friendly name for Weighted average

Jun 27, 2018
ec6be0a

update manifest.json

Jun 27, 2018
a6cb048

missed loader signature

Jun 28, 2018

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


12 changes: 6 additions & 6 deletions
src/Microsoft.ML.Ensemble/EntryPoints/DiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,21 +17,21 @@
namespace Microsoft.ML.Ensemble.EntryPoints
{
 [TlcModule.Component(Name = DisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
 public sealed class DisagreementDiversityFactory : ISupportDiversityMeasureFactory<Single>
 public sealed class DisagreementDiversityFactory : ISupportBinaryDiversityMeasureFactory
 {
 public IDiversityMeasure<float> CreateComponent(IHostEnvironment env) => new DisagreementDiversityMeasure();
 public IBinaryDiversityMeasure CreateComponent(IHostEnvironment env) => new DisagreementDiversityMeasure();
 }

 [TlcModule.Component(Name = RegressionDisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
 public sealed class RegressionDisagreementDiversityFactory : ISupportDiversityMeasureFactory<Single>
 public sealed class RegressionDisagreementDiversityFactory : ISupportRegressionDiversityMeasureFactory
 {
 public IDiversityMeasure<float> CreateComponent(IHostEnvironment env) => new RegressionDisagreementDiversityMeasure();
 public IRegressionDiversityMeasure CreateComponent(IHostEnvironment env) => new RegressionDisagreementDiversityMeasure();
 }

 [TlcModule.Component(Name = MultiDisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
 public sealed class MultiDisagreementDiversityFactory : ISupportDiversityMeasureFactory<VBuffer<Single>>
 public sealed class MultiDisagreementDiversityFactory : ISupportMulticlassDiversityMeasureFactory
 {
 public IDiversityMeasure<VBuffer<Single>> CreateComponent(IHostEnvironment env) => new MultiDisagreementDiversityMeasure();
 public IMulticlassDiversityMeasure CreateComponent(IHostEnvironment env) => new MultiDisagreementDiversityMeasure();
 }

}

3 changes: 1 addition & 2 deletions
src/Microsoft.ML.Ensemble/OutputCombiners/IOutputCombiner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ public interface IMultiClassOutputCombiner : IOutputCombiner<VBuffer<Single>>
 {
 }


 [TlcModule.ComponentKind("EnsembleMulticlassOutputCombiner")]
 public interface ISupportMulticlassOutputCombinerFactory : IComponentFactory<IMultiClassOutputCombiner>
 {
Expand All@@ -63,7 +62,7 @@ public interface ISupportRegressionOutputCombinerFactory : IComponentFactory<IRe
 {

 }

 public interface IWeightedAverager
 {
 string WeightageMetricName { get; }
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Ensemble/OutputCombiners/WeightedAverage.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ private static VersionInfo GetVersionInfo()
 loaderSignature: LoaderSignature);
 }

 [TlcModule.Component(Name = LoadName, FriendlyName = Stacking.UserName)]
 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments: ISupportBinaryOutputCombinerFactory
 {
 [Argument(ArgumentType.AtMostOnce, HelpText = "The metric type to be used to find the weights for each model", ShortName = "wn", SortOrder = 50)]
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/DisagreementDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
 public class DisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>
 public class DisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>, IBinaryDiversityMeasure
 {
 public const string UserName = "Disagreement Diversity Measure";
 public const string LoadName = "DisagreementDiversityMeasure";
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/MultiDisagreementDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
 public class MultiDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<VBuffer<Single>>
 public class MultiDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<VBuffer<Single>>, IMulticlassDiversityMeasure
 {
 public const string LoadName = "MultiDisagreementDiversityMeasure";

Expand Down

2 changes: 1 addition & 1 deletion
...Microsoft.ML.Ensemble/Selector/DiversityMeasure/RegressionDisagreementDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
 public class RegressionDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>
 public class RegressionDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>, IRegressionDiversityMeasure
 {
 public const string LoadName = "RegressionDisagreementDiversityMeasure";

Expand Down

23 changes: 21 additions & 2 deletions
src/Microsoft.ML.Ensemble/Selector/IDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,10 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.EntryPoints;

Expand All@@ -17,8 +19,25 @@ List<ModelDiversityMetric<TOutput>> CalculateDiversityMeasure(IList<FeatureSubse

 public delegate void SignatureEnsembleDiversityMeasure();

 [TlcModule.ComponentKind("EnsembleDiversityMeasure")]
 public interface ISupportDiversityMeasureFactory<TOutput> : IComponentFactory<IDiversityMeasure<TOutput>>
 public interface IBinaryDiversityMeasure : IDiversityMeasure<Single>
 { }
 public interface IRegressionDiversityMeasure : IDiversityMeasure<Single>
 { }
 public interface IMulticlassDiversityMeasure : IDiversityMeasure<VBuffer<Single>>
 { }

 [TlcModule.ComponentKind("EnsembleBinaryDiversityMeasure")]
 public interface ISupportBinaryDiversityMeasureFactory : IComponentFactory<IBinaryDiversityMeasure>
 {
 }

 [TlcModule.ComponentKind("EnsembleRegressionDiversityMeasure")]
 public interface ISupportRegressionDiversityMeasureFactory : IComponentFactory<IRegressionDiversityMeasure>
 {
 }

 [TlcModule.ComponentKind("EnsembleMulticlassDiversityMeasure")]
 public interface ISupportMulticlassDiversityMeasureFactory : IComponentFactory<IMulticlassDiversityMeasure>
 {
 }
}

17 changes: 5 additions & 12 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseDiverseSelector.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,9 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Internal.Internallearn;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Utilities;
using Microsoft.ML.Runtime.Training;

Expand All@@ -19,27 +18,21 @@ public abstract class BaseDiverseSelector<TOutput, TDiversityMetric> : SubModelD
 {
 public abstract class DiverseSelectorArguments : ArgumentsBase
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportDiversityMeasureFactory<TOutput> DiversityMetricType;
 }

 private readonly ISupportDiversityMeasureFactory<TOutput> _diversityMetricType;
 private readonly IComponentFactory<IDiversityMeasure<TOutput>> _diversityMetricType;
 private ConcurrentDictionary<FeatureSubsetModel<IPredictorProducing<TOutput>>, TOutput[]> _predictions;

 protected abstract ISupportDiversityMeasureFactory<TOutput> DefaultDiversityMetricType { get; }

 protected internal BaseDiverseSelector(IHostEnvironment env, DiverseSelectorArguments args, string name)
 protected internal BaseDiverseSelector(IHostEnvironment env, DiverseSelectorArguments args, string name,
 IComponentFactory<IDiversityMeasure<TOutput>> diversityMetricType)
 : base(args, env, name)
 {
 _diversityMetricType = args.DiversityMetricType;
 _diversityMetricType = diversityMetricType;
 _predictions = new ConcurrentDictionary<FeatureSubsetModel<IPredictorProducing<TOutput>>, TOutput[]>();
 }

 protected IDiversityMeasure<TOutput> CreateDiversityMetric()
 {
 if (_diversityMetricType == null)
 return DefaultDiversityMetricType.CreateComponent(Host);
 return _diversityMetricType.CreateComponent(Host);
 }

Expand Down

11 changes: 8 additions & 3 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorBinary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,12 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorBinary), typeof(BestDiverseSelectorBinary.Arguments),
 typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorBinary.UserName, BestDiverseSelectorBinary.LoadName)]
Expand All@@ -24,17 +26,20 @@ public sealed class BestDiverseSelectorBinary : BaseDiverseSelector<Single, Disa
 public const string UserName = "Best Diverse Selector";
 public const string LoadName = "BestDiverseSelector";

 protected override ISupportDiversityMeasureFactory<Single> DefaultDiversityMetricType => new DisagreementDiversityFactory();

 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments : DiverseSelectorArguments, ISupportBinarySubModelSelectorFactory
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportBinaryDiversityMeasureFactory DiversityMetricType = new DisagreementDiversityFactory();

 public IBinarySubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorBinary(env, this);
 }

 public BestDiverseSelectorBinary(IHostEnvironment env, Arguments args)
 : base(env, args, LoadName)
 : base(env, args, LoadName, args.DiversityMetricType)
 {

 }

 public override List<ModelDiversityMetric<Single>> CalculateDiversityMeasure(IList<FeatureSubsetModel<TScalarPredictor>> models,
Expand Down

10 changes: 7 additions & 3 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorMultiClass.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,13 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorMultiClass), typeof(BestDiverseSelectorMultiClass.Arguments),
 typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorMultiClass.UserName, BestDiverseSelectorMultiClass.LoadName)]
Expand All@@ -24,16 +26,18 @@ public sealed class BestDiverseSelectorMultiClass : BaseDiverseSelector<VBuffer<
 {
 public const string UserName = "Best Diverse Selector";
 public const string LoadName = "BestDiverseSelectorMultiClass";
 protected override ISupportDiversityMeasureFactory<VBuffer<Single>> DefaultDiversityMetricType => new MultiDisagreementDiversityFactory();

 [TlcModule.Component(Name = BestDiverseSelectorMultiClass.LoadName, FriendlyName = UserName)]
 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments : DiverseSelectorArguments, ISupportMulticlassSubModelSelectorFactory
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportMulticlassDiversityMeasureFactory DiversityMetricType = new MultiDisagreementDiversityFactory();
 public IMulticlassSubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorMultiClass(env, this);
 }

 public BestDiverseSelectorMultiClass(IHostEnvironment env, Arguments args)
 : base(env, args, LoadName)
 : base(env, args, LoadName, args.DiversityMetricType)
 {
 }

Expand Down

9 changes: 6 additions & 3 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorRegression.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,12 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorRegression), typeof(BestDiverseSelectorRegression.Arguments),
 typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorRegression.UserName, BestDiverseSelectorRegression.LoadName)]
Expand All@@ -24,16 +26,17 @@ public sealed class BestDiverseSelectorRegression : BaseDiverseSelector<Single,
 public const string UserName = "Best Diverse Selector";
 public const string LoadName = "BestDiverseSelectorRegression";

 protected override ISupportDiversityMeasureFactory<float> DefaultDiversityMetricType => new RegressionDisagreementDiversityFactory();

 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments : DiverseSelectorArguments, ISupportRegressionSubModelSelectorFactory
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportRegressionDiversityMeasureFactory DiversityMetricType = new RegressionDisagreementDiversityFactory();
 public IRegressionSubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorRegression(env, this);
 }

 public BestDiverseSelectorRegression(IHostEnvironment env, Arguments args)
 : base(env, args, LoadName)
 : base(env, args, LoadName, args.DiversityMetricType)
 {
 }

Expand Down

11 changes: 8 additions & 3 deletions
src/Microsoft.ML.Ensemble/Trainer/Multiclass/EnsembleMultiClassPredictor.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,17 +4,22 @@

using System;
using System.Threading.Tasks;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble;
using Microsoft.ML.Runtime.Ensemble.OutputCombiners;
using Microsoft.ML.Runtime.Model;

[assembly: LoadableClass(typeof(EnsembleMultiClassPredictor), null, typeof(SignatureLoadModel),
 EnsembleMultiClassPredictor.UserName, EnsembleMultiClassPredictor.LoaderSignature)]

namespace Microsoft.ML.Runtime.Ensemble
{
 using TVectorPredictor = IPredictorProducing<VBuffer<Single>>;
 public sealed class EnsembleMultiClassPredictor :
 EnsemblePredictorBase<TVectorPredictor, VBuffer<Single>>,
 IValueMapper

 public sealed class EnsembleMultiClassPredictor : EnsemblePredictorBase<TVectorPredictor, VBuffer<Single>>, IValueMapper
 {
 public const string UserName = "Ensemble Multiclass Executor";
 public const string LoaderSignature = "EnsemMcExec";
 public const string RegistrationName = "EnsembleMultiClassPredictor";

Expand Down

1 change: 0 additions & 1 deletion
...Microsoft.ML.StandardLearners/FactorizationMachine/FieldAwareFactorizationMachineUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,6 @@ internal static bool LoadOneExampleIntoBuffer(ValueGetter<VBuffer<float>>[] gett
 }
 }


 internal sealed class FieldAwareFactorizationMachineScalarRowMapper : ISchemaBoundRowMapper
 {
 private readonly FieldAwareFactorizationMachinePredictor _pred;
Expand Down
Loading

, '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
small fixes in ensembles#442

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

Ivanidzo4ka
merged 4 commits into

from

Jul 2, 2018
 Merged


small fixes in ensembles
#442
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
8789331

separate diversity measurment by interface

Jun 27, 2018
631a45d

proper friendly name for Weighted average

Jun 27, 2018
ec6be0a

update manifest.json

Jun 27, 2018
a6cb048

missed loader signature

Jun 28, 2018

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


12 changes: 6 additions & 6 deletions
src/Microsoft.ML.Ensemble/EntryPoints/DiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,21 +17,21 @@
namespace Microsoft.ML.Ensemble.EntryPoints
{
 [TlcModule.Component(Name = DisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
 public sealed class DisagreementDiversityFactory : ISupportDiversityMeasureFactory<Single>
 public sealed class DisagreementDiversityFactory : ISupportBinaryDiversityMeasureFactory
 {
 public IDiversityMeasure<float> CreateComponent(IHostEnvironment env) => new DisagreementDiversityMeasure();
 public IBinaryDiversityMeasure CreateComponent(IHostEnvironment env) => new DisagreementDiversityMeasure();
 }

 [TlcModule.Component(Name = RegressionDisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
 public sealed class RegressionDisagreementDiversityFactory : ISupportDiversityMeasureFactory<Single>
 public sealed class RegressionDisagreementDiversityFactory : ISupportRegressionDiversityMeasureFactory
 {
 public IDiversityMeasure<float> CreateComponent(IHostEnvironment env) => new RegressionDisagreementDiversityMeasure();
 public IRegressionDiversityMeasure CreateComponent(IHostEnvironment env) => new RegressionDisagreementDiversityMeasure();
 }

 [TlcModule.Component(Name = MultiDisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
 public sealed class MultiDisagreementDiversityFactory : ISupportDiversityMeasureFactory<VBuffer<Single>>
 public sealed class MultiDisagreementDiversityFactory : ISupportMulticlassDiversityMeasureFactory
 {
 public IDiversityMeasure<VBuffer<Single>> CreateComponent(IHostEnvironment env) => new MultiDisagreementDiversityMeasure();
 public IMulticlassDiversityMeasure CreateComponent(IHostEnvironment env) => new MultiDisagreementDiversityMeasure();
 }

}

3 changes: 1 addition & 2 deletions
src/Microsoft.ML.Ensemble/OutputCombiners/IOutputCombiner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ public interface IMultiClassOutputCombiner : IOutputCombiner<VBuffer<Single>>
 {
 }


 [TlcModule.ComponentKind("EnsembleMulticlassOutputCombiner")]
 public interface ISupportMulticlassOutputCombinerFactory : IComponentFactory<IMultiClassOutputCombiner>
 {
Expand All@@ -63,7 +62,7 @@ public interface ISupportRegressionOutputCombinerFactory : IComponentFactory<IRe
 {

 }

 public interface IWeightedAverager
 {
 string WeightageMetricName { get; }
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Ensemble/OutputCombiners/WeightedAverage.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ private static VersionInfo GetVersionInfo()
 loaderSignature: LoaderSignature);
 }

 [TlcModule.Component(Name = LoadName, FriendlyName = Stacking.UserName)]
 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments: ISupportBinaryOutputCombinerFactory
 {
 [Argument(ArgumentType.AtMostOnce, HelpText = "The metric type to be used to find the weights for each model", ShortName = "wn", SortOrder = 50)]
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/DisagreementDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
 public class DisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>
 public class DisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>, IBinaryDiversityMeasure
 {
 public const string UserName = "Disagreement Diversity Measure";
 public const string LoadName = "DisagreementDiversityMeasure";
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/MultiDisagreementDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
 public class MultiDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<VBuffer<Single>>
 public class MultiDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<VBuffer<Single>>, IMulticlassDiversityMeasure
 {
 public const string LoadName = "MultiDisagreementDiversityMeasure";

Expand Down

2 changes: 1 addition & 1 deletion
...Microsoft.ML.Ensemble/Selector/DiversityMeasure/RegressionDisagreementDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@

namespace Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure
{
 public class RegressionDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>
 public class RegressionDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>, IRegressionDiversityMeasure
 {
 public const string LoadName = "RegressionDisagreementDiversityMeasure";

Expand Down

23 changes: 21 additions & 2 deletions
src/Microsoft.ML.Ensemble/Selector/IDiversityMeasure.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,10 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.EntryPoints;

Expand All@@ -17,8 +19,25 @@ List<ModelDiversityMetric<TOutput>> CalculateDiversityMeasure(IList<FeatureSubse

 public delegate void SignatureEnsembleDiversityMeasure();

 [TlcModule.ComponentKind("EnsembleDiversityMeasure")]
 public interface ISupportDiversityMeasureFactory<TOutput> : IComponentFactory<IDiversityMeasure<TOutput>>
 public interface IBinaryDiversityMeasure : IDiversityMeasure<Single>
 { }
 public interface IRegressionDiversityMeasure : IDiversityMeasure<Single>
 { }
 public interface IMulticlassDiversityMeasure : IDiversityMeasure<VBuffer<Single>>
 { }

 [TlcModule.ComponentKind("EnsembleBinaryDiversityMeasure")]
 public interface ISupportBinaryDiversityMeasureFactory : IComponentFactory<IBinaryDiversityMeasure>
 {
 }

 [TlcModule.ComponentKind("EnsembleRegressionDiversityMeasure")]
 public interface ISupportRegressionDiversityMeasureFactory : IComponentFactory<IRegressionDiversityMeasure>
 {
 }

 [TlcModule.ComponentKind("EnsembleMulticlassDiversityMeasure")]
 public interface ISupportMulticlassDiversityMeasureFactory : IComponentFactory<IMulticlassDiversityMeasure>
 {
 }
}

17 changes: 5 additions & 12 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseDiverseSelector.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,9 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Internal.Internallearn;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Utilities;
using Microsoft.ML.Runtime.Training;

Expand All@@ -19,27 +18,21 @@ public abstract class BaseDiverseSelector<TOutput, TDiversityMetric> : SubModelD
 {
 public abstract class DiverseSelectorArguments : ArgumentsBase
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportDiversityMeasureFactory<TOutput> DiversityMetricType;
 }

 private readonly ISupportDiversityMeasureFactory<TOutput> _diversityMetricType;
 private readonly IComponentFactory<IDiversityMeasure<TOutput>> _diversityMetricType;
 private ConcurrentDictionary<FeatureSubsetModel<IPredictorProducing<TOutput>>, TOutput[]> _predictions;

 protected abstract ISupportDiversityMeasureFactory<TOutput> DefaultDiversityMetricType { get; }

 protected internal BaseDiverseSelector(IHostEnvironment env, DiverseSelectorArguments args, string name)
 protected internal BaseDiverseSelector(IHostEnvironment env, DiverseSelectorArguments args, string name,
 IComponentFactory<IDiversityMeasure<TOutput>> diversityMetricType)
 : base(args, env, name)
 {
 _diversityMetricType = args.DiversityMetricType;
 _diversityMetricType = diversityMetricType;
 _predictions = new ConcurrentDictionary<FeatureSubsetModel<IPredictorProducing<TOutput>>, TOutput[]>();
 }

 protected IDiversityMeasure<TOutput> CreateDiversityMetric()
 {
 if (_diversityMetricType == null)
 return DefaultDiversityMetricType.CreateComponent(Host);
 return _diversityMetricType.CreateComponent(Host);
 }

Expand Down

11 changes: 8 additions & 3 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorBinary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,12 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorBinary), typeof(BestDiverseSelectorBinary.Arguments),
 typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorBinary.UserName, BestDiverseSelectorBinary.LoadName)]
Expand All@@ -24,17 +26,20 @@ public sealed class BestDiverseSelectorBinary : BaseDiverseSelector<Single, Disa
 public const string UserName = "Best Diverse Selector";
 public const string LoadName = "BestDiverseSelector";

 protected override ISupportDiversityMeasureFactory<Single> DefaultDiversityMetricType => new DisagreementDiversityFactory();

 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments : DiverseSelectorArguments, ISupportBinarySubModelSelectorFactory
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportBinaryDiversityMeasureFactory DiversityMetricType = new DisagreementDiversityFactory();

 public IBinarySubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorBinary(env, this);
 }

 public BestDiverseSelectorBinary(IHostEnvironment env, Arguments args)
 : base(env, args, LoadName)
 : base(env, args, LoadName, args.DiversityMetricType)
 {

 }

 public override List<ModelDiversityMetric<Single>> CalculateDiversityMeasure(IList<FeatureSubsetModel<TScalarPredictor>> models,
Expand Down

10 changes: 7 additions & 3 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorMultiClass.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,13 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorMultiClass), typeof(BestDiverseSelectorMultiClass.Arguments),
 typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorMultiClass.UserName, BestDiverseSelectorMultiClass.LoadName)]
Expand All@@ -24,16 +26,18 @@ public sealed class BestDiverseSelectorMultiClass : BaseDiverseSelector<VBuffer<
 {
 public const string UserName = "Best Diverse Selector";
 public const string LoadName = "BestDiverseSelectorMultiClass";
 protected override ISupportDiversityMeasureFactory<VBuffer<Single>> DefaultDiversityMetricType => new MultiDisagreementDiversityFactory();

 [TlcModule.Component(Name = BestDiverseSelectorMultiClass.LoadName, FriendlyName = UserName)]
 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments : DiverseSelectorArguments, ISupportMulticlassSubModelSelectorFactory
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportMulticlassDiversityMeasureFactory DiversityMetricType = new MultiDisagreementDiversityFactory();
 public IMulticlassSubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorMultiClass(env, this);
 }

 public BestDiverseSelectorMultiClass(IHostEnvironment env, Arguments args)
 : base(env, args, LoadName)
 : base(env, args, LoadName, args.DiversityMetricType)
 {
 }

Expand Down

9 changes: 6 additions & 3 deletions
src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorRegression.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,12 @@
using System.Collections.Generic;
using Microsoft.ML.Ensemble.EntryPoints;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.CommandLine;
using Microsoft.ML.Runtime.Ensemble.Selector;
using Microsoft.ML.Runtime.Ensemble.Selector.DiversityMeasure;
using Microsoft.ML.Runtime.Ensemble.Selector.SubModelSelector;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.Runtime.Internal.Internallearn;

[assembly: LoadableClass(typeof(BestDiverseSelectorRegression), typeof(BestDiverseSelectorRegression.Arguments),
 typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorRegression.UserName, BestDiverseSelectorRegression.LoadName)]
Expand All@@ -24,16 +26,17 @@ public sealed class BestDiverseSelectorRegression : BaseDiverseSelector<Single,
 public const string UserName = "Best Diverse Selector";
 public const string LoadName = "BestDiverseSelectorRegression";

 protected override ISupportDiversityMeasureFactory<float> DefaultDiversityMetricType => new RegressionDisagreementDiversityFactory();

 [TlcModule.Component(Name = LoadName, FriendlyName = UserName)]
 public sealed class Arguments : DiverseSelectorArguments, ISupportRegressionSubModelSelectorFactory
 {
 [Argument(ArgumentType.Multiple, HelpText = "The metric type to be used to find the diversity among base learners", ShortName = "dm", SortOrder = 50)]
 [TGUI(Label = "Diversity Measure Type")]
 public ISupportRegressionDiversityMeasureFactory DiversityMetricType = new RegressionDisagreementDiversityFactory();
 public IRegressionSubModelSelector CreateComponent(IHostEnvironment env) => new BestDiverseSelectorRegression(env, this);
 }

 public BestDiverseSelectorRegression(IHostEnvironment env, Arguments args)
 : base(env, args, LoadName)
 : base(env, args, LoadName, args.DiversityMetricType)
 {
 }

Expand Down

11 changes: 8 additions & 3 deletions
src/Microsoft.ML.Ensemble/Trainer/Multiclass/EnsembleMultiClassPredictor.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,17 +4,22 @@

using System;
using System.Threading.Tasks;
using Microsoft.ML.Runtime;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Ensemble;
using Microsoft.ML.Runtime.Ensemble.OutputCombiners;
using Microsoft.ML.Runtime.Model;

[assembly: LoadableClass(typeof(EnsembleMultiClassPredictor), null, typeof(SignatureLoadModel),
 EnsembleMultiClassPredictor.UserName, EnsembleMultiClassPredictor.LoaderSignature)]

namespace Microsoft.ML.Runtime.Ensemble
{
 using TVectorPredictor = IPredictorProducing<VBuffer<Single>>;
 public sealed class EnsembleMultiClassPredictor :
 EnsemblePredictorBase<TVectorPredictor, VBuffer<Single>>,
 IValueMapper

 public sealed class EnsembleMultiClassPredictor : EnsemblePredictorBase<TVectorPredictor, VBuffer<Single>>, IValueMapper
 {
 public const string UserName = "Ensemble Multiclass Executor";
 public const string LoaderSignature = "EnsemMcExec";
 public const string RegistrationName = "EnsembleMultiClassPredictor";

Expand Down

1 change: 0 additions & 1 deletion
...Microsoft.ML.StandardLearners/FactorizationMachine/FieldAwareFactorizationMachineUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,6 @@ internal static bool LoadOneExampleIntoBuffer(ValueGetter<VBuffer<float>>[] gett
 }
 }


 internal sealed class FieldAwareFactorizationMachineScalarRowMapper : ISchemaBoundRowMapper
 {
 private readonly FieldAwareFactorizationMachinePredictor _pred;
Expand Down
Loading