switch housing dataset to wine#170

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 14 commits into from
May 23, 2018
Merged

switch housing dataset to wine #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e6fde16
replace housing uci dataset to wine quality
May 4, 2018
dd969aa
proper order
May 4, 2018
8777327
unix slash
May 4, 2018
ccfad34
download only if they not present
May 16, 2018
40f1574
Merge branch 'master' into ivanidze/switch_housing_dataset_to_wine
May 16, 2018
a49ed52
remove parenthesis
May 16, 2018
dc2be36
fix build
May 16, 2018
ee307bf
Replace Result to DestinationFile
May 16, 2018
0353bb7
move Url to subelement
May 18, 2018
7d76cd3
formatting
May 18, 2018
08a2a00
switch to sub-elements
May 22, 2018
45478c2
merge from master
May 22, 2018
f9bcb74
Update CrossValidationMacro
May 22, 2018
72abef1
create dataset
May 22, 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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -328,3 +328,5 @@ ASALocalRun/

# MSBuild Binary and Structured Log
*.binlog
# Ignore external test datasets.
/test/data/external/
18 changes: 16 additions & 2 deletions build.proj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />

<Import Project="$(ToolsDir)VersionTools.targets" Condition="Exists('$(ToolsDir)VersionTools.targets')" />

<UsingTask TaskName="DownloadFilesFromUrl" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll"/>
<PropertyGroup>
<!-- To disable the restoration of packages, set RestoreDuringBuild=false or pass /p:RestoreDuringBuild=false.-->
<RestoreDuringBuild Condition="'$(RestoreDuringBuild)'==''">true</RestoreDuringBuild>
Expand All@@ -33,6 +33,7 @@
RestoreProjects;
BuildNative;
$(TraversalBuildDependsOn);
DownloadExternalTestFiles;
RunTests;
</TraversalBuildDependsOn>
</PropertyGroup>
Expand All@@ -56,13 +57,26 @@
<ItemGroup>
<PkgProject Include="pkg\**\*.nupkgproj" />
</ItemGroup>

<MSBuild Projects="@(PkgProject)"
Targets="Restore" />
<MSBuild Projects="@(PkgProject)"
Targets="Pack" />
</Target>

<ItemGroup>
<TestFile Include="$(MSBuildThisFileDirectory)/test/data/external/winequality-white.csv"
Url="https://archive.ics.uci.edu/ml/machine-learning-databases/wine-quality/winequality-white.csv"
DestinationFile="$(MSBuildThisFileDirectory)test/data/external/winequality-white.csv" />
</ItemGroup>

<Target Name="DownloadExternalTestFiles" Inputs="@(TestFile)" Outputs="%(TestFile.DestinationFile)">
<Message Importance="High" Text="Downloading external test files... %(TestFile.DestinationFile)" />
<DownloadFilesFromUrl Items="@(TestFile)"
DestinationDir="test/data/external"
TreatErrorsAsWarnings="true"/>
</Target>

<Target Name="RunTests" Condition="'$(RunTests)'=='true'">
<MSBuild Projects="test\run-tests.proj"
Targets="RunTests" />
Expand Down
32 changes: 28 additions & 4 deletions test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@

using ML = Microsoft.ML;
using Microsoft.ML.Runtime;
using Microsoft.ML.Data;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.TestFramework;
Expand DownExpand Up@@ -269,10 +270,10 @@ public void TestCrossValidationBinaryMacro()
}
}

[Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
[Fact]
public void TestCrossValidationMacro()
{
var dataPath = GetDataPath(@"housing.txt");
var dataPath = GetDataPath(TestDatasets.winequality.trainFilename);
using (var env = new TlcEnvironment())
{
var subGraph = env.CreateExperiment();
Expand All@@ -295,7 +296,30 @@ public void TestCrossValidationMacro()
var modelCombineOutput = subGraph.Add(modelCombine);

var experiment = env.CreateExperiment();
var importInput = new ML.Data.TextLoader(dataPath);
var importInput = new ML.Data.TextLoader(dataPath)
{
Arguments = new TextLoaderArguments
{
Separator = new[] { ';' },
HasHeader = true,
Column = new[]
{
new TextLoaderColumn()
{
Name = "Label",
Source = new [] { new TextLoaderRange(11) },
Type = DataKind.Num
},

new TextLoaderColumn()
{
Name = "Features",
Source = new [] { new TextLoaderRange(0,10) },
Type = DataKind.Num
}
}
}
};
var importOutput = experiment.Add(importInput);

var crossValidate = new ML.Models.CrossValidator
Expand DownExpand Up@@ -324,7 +348,7 @@ public void TestCrossValidationMacro()
Assert.True(b);
double val = 0;
getter(ref val);
Assert.Equal(3.32, val, 1);
Assert.Equal(0.58, val, 1);
b = cursor.MoveNext();
Assert.False(b);
}
Expand Down
23 changes: 13 additions & 10 deletions test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -910,7 +910,7 @@ public void EntryPointTextToKeyToText()
}

private void RunTrainScoreEvaluate(string learner, string evaluator, string dataPath, string warningsPath, string overallMetricsPath,
string instanceMetricsPath, string confusionMatrixPath = null)
string instanceMetricsPath, string confusionMatrixPath = null, string loader = null)
{
string inputGraph = string.Format(@"
{{
Expand All@@ -919,6 +919,7 @@ private void RunTrainScoreEvaluate(string learner, string evaluator, string data
'Name': 'Data.CustomTextLoader',
'Inputs': {{
'InputFile': '$file'
{8}
}},
'Outputs': {{
'Data': '$AllData'
Expand DownExpand Up@@ -978,7 +979,8 @@ private void RunTrainScoreEvaluate(string learner, string evaluator, string data
}}
}}", learner, evaluator, EscapePath(dataPath), EscapePath(warningsPath), EscapePath(overallMetricsPath), EscapePath(instanceMetricsPath),
confusionMatrixPath != null ? ", 'ConfusionMatrix': '$ConfusionMatrix'" : "",
confusionMatrixPath != null ? string.Format(", 'ConfusionMatrix' : '{0}'", EscapePath(confusionMatrixPath)) : "");
confusionMatrixPath != null ? string.Format(", 'ConfusionMatrix' : '{0}'", EscapePath(confusionMatrixPath)) : "",
string.IsNullOrWhiteSpace(loader) ? "" : string.Format(",'CustomSchema': '{0}'", loader));

var jsonPath = DeleteOutputPath("graph.json");
File.WriteAllLines(jsonPath, new[] { inputGraph });
Expand DownExpand Up@@ -1036,15 +1038,16 @@ public void EntryPointEvaluateMultiClass()
Assert.Equal(3, CountRows(loader));
}

[Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
[Fact]
public void EntryPointEvaluateRegression()
{
var dataPath = GetDataPath("housing.txt");
var dataPath = GetDataPath(TestDatasets.winequality.trainFilename);
var warningsPath = DeleteOutputPath("warnings.idv");
var overallMetricsPath = DeleteOutputPath("overall.idv");
var instanceMetricsPath = DeleteOutputPath("instance.idv");

RunTrainScoreEvaluate("Trainers.StochasticDualCoordinateAscentRegressor", "Models.RegressionEvaluator", dataPath, warningsPath, overallMetricsPath, instanceMetricsPath);
RunTrainScoreEvaluate("Trainers.StochasticDualCoordinateAscentRegressor", "Models.RegressionEvaluator",
dataPath, warningsPath, overallMetricsPath, instanceMetricsPath, loader: TestDatasets.winequality.loaderSettings);

using (var loader = new BinaryLoader(Env, new BinaryLoader.Arguments(), warningsPath))
Assert.Equal(0, CountRows(loader));
Expand All@@ -1053,7 +1056,7 @@ public void EntryPointEvaluateRegression()
Assert.Equal(1, CountRows(loader));

using (var loader = new BinaryLoader(Env, new BinaryLoader.Arguments(), instanceMetricsPath))
Assert.Equal(104, CountRows(loader));
Assert.Equal(975, CountRows(loader));
}

[Fact]
Expand All@@ -1068,10 +1071,10 @@ public void EntryPointSDCAMultiClass()
TestEntryPointRoutine("iris.txt", "Trainers.StochasticDualCoordinateAscentClassifier");
}

[Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
[Fact()]
public void EntryPointSDCARegression()
{
TestEntryPointRoutine("housing.txt", "Trainers.StochasticDualCoordinateAscentRegressor");
TestEntryPointRoutine(TestDatasets.winequality.trainFilename, "Trainers.StochasticDualCoordinateAscentRegressor", loader: TestDatasets.winequality.loaderSettings);
}

[Fact]
Expand DownExpand Up@@ -1142,10 +1145,10 @@ public void EntryPointHogwildSGD()
TestEntryPointRoutine("breast-cancer.txt", "Trainers.StochasticGradientDescentBinaryClassifier");
}

[Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
[Fact()]
public void EntryPointPoissonRegression()
{
TestEntryPointRoutine("housing.txt", "Trainers.PoissonRegressor");
TestEntryPointRoutine(TestDatasets.winequality.trainFilename, "Trainers.PoissonRegressor", loader: TestDatasets.winequality.loaderSettings);
}

[Fact]
Expand Down
8 changes: 8 additions & 0 deletions test/Microsoft.ML.TestFramework/Datasets.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,6 +152,14 @@ public static class TestDatasets
testFilename = "housing.txt"
};

public static TestDataset winequality = new TestDataset
{
name = "wine",
trainFilename = "external/winequality-white.csv",
testFilename = "external/winequality-white.csv",
loaderSettings = "col=Label:R4:11 col=Features:R4:0-10 sep=; header+"
};

public static TestDataset msm = new TestDataset
{
// REVIEW: Why is the MSM train set smaller than the test set? Reverse these!
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,6 @@

<ItemGroup>
<NativeAssemblyReference Include="CpuMathNative" />
<NativeAssemblyReference Include="FastTreeNative" />
<NativeAssemblyReference Include="FastTreeNative" />
</ItemGroup>
</Project>
, '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
switch housing dataset to wine#170

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 14 commits into

from

May 23, 2018
 Merged


switch housing dataset to wine
#170
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e6fde16

replace housing uci dataset to wine quality

May 4, 2018
dd969aa

proper order

May 4, 2018
8777327

unix slash

May 4, 2018
ccfad34

download only if they not present

May 16, 2018
40f1574

Merge branch 'master' into ivanidze/switch_housing_dataset_to_wine

May 16, 2018
a49ed52

remove parenthesis

May 16, 2018
dc2be36

fix build

May 16, 2018
ee307bf

Replace Result to DestinationFile

May 16, 2018
0353bb7

move Url to subelement

May 18, 2018
7d76cd3

formatting

May 18, 2018
08a2a00

switch to sub-elements

May 22, 2018
45478c2

merge from master

May 22, 2018
f9bcb74

Update CrossValidationMacro

May 22, 2018
72abef1

create dataset

May 22, 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


2 changes: 2 additions & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,3 +328,5 @@ ASALocalRun/

# MSBuild Binary and Structured Log
*.binlog
# Ignore external test datasets.
/test/data/external/

18 changes: 16 additions & 2 deletions
build.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />

 <Import Project="$(ToolsDir)VersionTools.targets" Condition="Exists('$(ToolsDir)VersionTools.targets')" />

 <UsingTask TaskName="DownloadFilesFromUrl" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll"/>
 <PropertyGroup>
 <!-- To disable the restoration of packages, set RestoreDuringBuild=false or pass /p:RestoreDuringBuild=false.-->
 <RestoreDuringBuild Condition="'$(RestoreDuringBuild)'==''">true</RestoreDuringBuild>
Expand All@@ -33,6 +33,7 @@
 RestoreProjects;
 BuildNative;
 $(TraversalBuildDependsOn);
 DownloadExternalTestFiles;
 RunTests;
 </TraversalBuildDependsOn>
 </PropertyGroup>
Expand All@@ -56,13 +57,26 @@
 <ItemGroup>
 <PkgProject Include="pkg\**\*.nupkgproj" />
 </ItemGroup>

 <MSBuild Projects="@(PkgProject)"
 Targets="Restore" />
 <MSBuild Projects="@(PkgProject)"
 Targets="Pack" />
 </Target>

 <ItemGroup>
 <TestFile Include="$(MSBuildThisFileDirectory)/test/data/external/winequality-white.csv"
 Url="https://archive.ics.uci.edu/ml/machine-learning-databases/wine-quality/winequality-white.csv"
 DestinationFile="$(MSBuildThisFileDirectory)test/data/external/winequality-white.csv" />
 </ItemGroup>

 <Target Name="DownloadExternalTestFiles" Inputs="@(TestFile)" Outputs="%(TestFile.DestinationFile)">
 <Message Importance="High" Text="Downloading external test files... %(TestFile.DestinationFile)" />
 <DownloadFilesFromUrl Items="@(TestFile)"
 DestinationDir="test/data/external"
 TreatErrorsAsWarnings="true"/>
 </Target>

 <Target Name="RunTests" Condition="'$(RunTests)'=='true'">
 <MSBuild Projects="test\run-tests.proj"
 Targets="RunTests" />
Expand Down

32 changes: 28 additions & 4 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs

View file


Open in desktop

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

using ML = Microsoft.ML;
using Microsoft.ML.Runtime;
using Microsoft.ML.Data;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.TestFramework;
Expand DownExpand Up@@ -269,10 +270,10 @@ public void TestCrossValidationBinaryMacro()
 }
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact]
 public void TestCrossValidationMacro()
 {
 var dataPath = GetDataPath(@"housing.txt");
 var dataPath = GetDataPath(TestDatasets.winequality.trainFilename);
 using (var env = new TlcEnvironment())
 {
 var subGraph = env.CreateExperiment();
Expand All@@ -295,7 +296,30 @@ public void TestCrossValidationMacro()
 var modelCombineOutput = subGraph.Add(modelCombine);

 var experiment = env.CreateExperiment();
 var importInput = new ML.Data.TextLoader(dataPath);
 var importInput = new ML.Data.TextLoader(dataPath)
 {
 Arguments = new TextLoaderArguments
 {
 Separator = new[] { ';' },
 HasHeader = true,
 Column = new[]
 {
 new TextLoaderColumn()
 {
 Name = "Label",
 Source = new [] { new TextLoaderRange(11) },
 Type = DataKind.Num
 },

 new TextLoaderColumn()
 {
 Name = "Features",
 Source = new [] { new TextLoaderRange(0,10) },
 Type = DataKind.Num
 }
 }
 }
 };
 var importOutput = experiment.Add(importInput);

 var crossValidate = new ML.Models.CrossValidator
Expand DownExpand Up@@ -324,7 +348,7 @@ public void TestCrossValidationMacro()
 Assert.True(b);
 double val = 0;
 getter(ref val);
 Assert.Equal(3.32, val, 1);
 Assert.Equal(0.58, val, 1);
 b = cursor.MoveNext();
 Assert.False(b);
 }
Expand Down

23 changes: 13 additions & 10 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -910,7 +910,7 @@ public void EntryPointTextToKeyToText()
 }

 private void RunTrainScoreEvaluate(string learner, string evaluator, string dataPath, string warningsPath, string overallMetricsPath,
 string instanceMetricsPath, string confusionMatrixPath = null)
 string instanceMetricsPath, string confusionMatrixPath = null, string loader = null)
 {
 string inputGraph = string.Format(@"
 {{
Expand All@@ -919,6 +919,7 @@ private void RunTrainScoreEvaluate(string learner, string evaluator, string data
 'Name': 'Data.CustomTextLoader',
 'Inputs': {{
 'InputFile': '$file'
 {8}
 }},
 'Outputs': {{
 'Data': '$AllData'
Expand DownExpand Up@@ -978,7 +979,8 @@ private void RunTrainScoreEvaluate(string learner, string evaluator, string data
 }}
 }}", learner, evaluator, EscapePath(dataPath), EscapePath(warningsPath), EscapePath(overallMetricsPath), EscapePath(instanceMetricsPath),
 confusionMatrixPath != null ? ", 'ConfusionMatrix': '$ConfusionMatrix'" : "",
 confusionMatrixPath != null ? string.Format(", 'ConfusionMatrix' : '{0}'", EscapePath(confusionMatrixPath)) : "");
 confusionMatrixPath != null ? string.Format(", 'ConfusionMatrix' : '{0}'", EscapePath(confusionMatrixPath)) : "",
 string.IsNullOrWhiteSpace(loader) ? "" : string.Format(",'CustomSchema': '{0}'", loader));

 var jsonPath = DeleteOutputPath("graph.json");
 File.WriteAllLines(jsonPath, new[] { inputGraph });
Expand DownExpand Up@@ -1036,15 +1038,16 @@ public void EntryPointEvaluateMultiClass()
 Assert.Equal(3, CountRows(loader));
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact]
 public void EntryPointEvaluateRegression()
 {
 var dataPath = GetDataPath("housing.txt");
 var dataPath = GetDataPath(TestDatasets.winequality.trainFilename);
 var warningsPath = DeleteOutputPath("warnings.idv");
 var overallMetricsPath = DeleteOutputPath("overall.idv");
 var instanceMetricsPath = DeleteOutputPath("instance.idv");

 RunTrainScoreEvaluate("Trainers.StochasticDualCoordinateAscentRegressor", "Models.RegressionEvaluator", dataPath, warningsPath, overallMetricsPath, instanceMetricsPath);
 RunTrainScoreEvaluate("Trainers.StochasticDualCoordinateAscentRegressor", "Models.RegressionEvaluator",
 dataPath, warningsPath, overallMetricsPath, instanceMetricsPath, loader: TestDatasets.winequality.loaderSettings);

 using (var loader = new BinaryLoader(Env, new BinaryLoader.Arguments(), warningsPath))
 Assert.Equal(0, CountRows(loader));
Expand All@@ -1053,7 +1056,7 @@ public void EntryPointEvaluateRegression()
 Assert.Equal(1, CountRows(loader));

 using (var loader = new BinaryLoader(Env, new BinaryLoader.Arguments(), instanceMetricsPath))
 Assert.Equal(104, CountRows(loader));
 Assert.Equal(975, CountRows(loader));
 }

 [Fact]
Expand All@@ -1068,10 +1071,10 @@ public void EntryPointSDCAMultiClass()
 TestEntryPointRoutine("iris.txt", "Trainers.StochasticDualCoordinateAscentClassifier");
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact()]
 public void EntryPointSDCARegression()
 {
 TestEntryPointRoutine("housing.txt", "Trainers.StochasticDualCoordinateAscentRegressor");
 TestEntryPointRoutine(TestDatasets.winequality.trainFilename, "Trainers.StochasticDualCoordinateAscentRegressor", loader: TestDatasets.winequality.loaderSettings);
 }

 [Fact]
Expand DownExpand Up@@ -1142,10 +1145,10 @@ public void EntryPointHogwildSGD()
 TestEntryPointRoutine("breast-cancer.txt", "Trainers.StochasticGradientDescentBinaryClassifier");
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact()]
 public void EntryPointPoissonRegression()
 {
 TestEntryPointRoutine("housing.txt", "Trainers.PoissonRegressor");
 TestEntryPointRoutine(TestDatasets.winequality.trainFilename, "Trainers.PoissonRegressor", loader: TestDatasets.winequality.loaderSettings);
 }

 [Fact]
Expand Down

8 changes: 8 additions & 0 deletions
test/Microsoft.ML.TestFramework/Datasets.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,6 +152,14 @@ public static class TestDatasets
 testFilename = "housing.txt"
 };

 public static TestDataset winequality = new TestDataset
 {
 name = "wine",
 trainFilename = "external/winequality-white.csv",
 testFilename = "external/winequality-white.csv",
 loaderSettings = "col=Label:R4:11 col=Features:R4:0-10 sep=; header+"
 };

 public static TestDataset msm = new TestDataset
 {
 // REVIEW: Why is the MSM train set smaller than the test set? Reverse these!
Expand Down

2 changes: 1 addition & 1 deletion
test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,6 @@

 <ItemGroup>
 <NativeAssemblyReference Include="CpuMathNative" />
<NativeAssemblyReference Include="FastTreeNative" />
<NativeAssemblyReference Include="FastTreeNative" />
 </ItemGroup>
</Project>

, '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
switch housing dataset to wine#170

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 14 commits into

from

May 23, 2018
 Merged


switch housing dataset to wine
#170
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e6fde16

replace housing uci dataset to wine quality

May 4, 2018
dd969aa

proper order

May 4, 2018
8777327

unix slash

May 4, 2018
ccfad34

download only if they not present

May 16, 2018
40f1574

Merge branch 'master' into ivanidze/switch_housing_dataset_to_wine

May 16, 2018
a49ed52

remove parenthesis

May 16, 2018
dc2be36

fix build

May 16, 2018
ee307bf

Replace Result to DestinationFile

May 16, 2018
0353bb7

move Url to subelement

May 18, 2018
7d76cd3

formatting

May 18, 2018
08a2a00

switch to sub-elements

May 22, 2018
45478c2

merge from master

May 22, 2018
f9bcb74

Update CrossValidationMacro

May 22, 2018
72abef1

create dataset

May 22, 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


2 changes: 2 additions & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,3 +328,5 @@ ASALocalRun/

# MSBuild Binary and Structured Log
*.binlog
# Ignore external test datasets.
/test/data/external/

18 changes: 16 additions & 2 deletions
build.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />

 <Import Project="$(ToolsDir)VersionTools.targets" Condition="Exists('$(ToolsDir)VersionTools.targets')" />

 <UsingTask TaskName="DownloadFilesFromUrl" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll"/>
 <PropertyGroup>
 <!-- To disable the restoration of packages, set RestoreDuringBuild=false or pass /p:RestoreDuringBuild=false.-->
 <RestoreDuringBuild Condition="'$(RestoreDuringBuild)'==''">true</RestoreDuringBuild>
Expand All@@ -33,6 +33,7 @@
 RestoreProjects;
 BuildNative;
 $(TraversalBuildDependsOn);
 DownloadExternalTestFiles;
 RunTests;
 </TraversalBuildDependsOn>
 </PropertyGroup>
Expand All@@ -56,13 +57,26 @@
 <ItemGroup>
 <PkgProject Include="pkg\**\*.nupkgproj" />
 </ItemGroup>

 <MSBuild Projects="@(PkgProject)"
 Targets="Restore" />
 <MSBuild Projects="@(PkgProject)"
 Targets="Pack" />
 </Target>

 <ItemGroup>
 <TestFile Include="$(MSBuildThisFileDirectory)/test/data/external/winequality-white.csv"
 Url="https://archive.ics.uci.edu/ml/machine-learning-databases/wine-quality/winequality-white.csv"
 DestinationFile="$(MSBuildThisFileDirectory)test/data/external/winequality-white.csv" />
 </ItemGroup>

 <Target Name="DownloadExternalTestFiles" Inputs="@(TestFile)" Outputs="%(TestFile.DestinationFile)">
 <Message Importance="High" Text="Downloading external test files... %(TestFile.DestinationFile)" />
 <DownloadFilesFromUrl Items="@(TestFile)"
 DestinationDir="test/data/external"
 TreatErrorsAsWarnings="true"/>
 </Target>

 <Target Name="RunTests" Condition="'$(RunTests)'=='true'">
 <MSBuild Projects="test\run-tests.proj"
 Targets="RunTests" />
Expand Down

32 changes: 28 additions & 4 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs

View file


Open in desktop

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

using ML = Microsoft.ML;
using Microsoft.ML.Runtime;
using Microsoft.ML.Data;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.TestFramework;
Expand DownExpand Up@@ -269,10 +270,10 @@ public void TestCrossValidationBinaryMacro()
 }
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact]
 public void TestCrossValidationMacro()
 {
 var dataPath = GetDataPath(@"housing.txt");
 var dataPath = GetDataPath(TestDatasets.winequality.trainFilename);
 using (var env = new TlcEnvironment())
 {
 var subGraph = env.CreateExperiment();
Expand All@@ -295,7 +296,30 @@ public void TestCrossValidationMacro()
 var modelCombineOutput = subGraph.Add(modelCombine);

 var experiment = env.CreateExperiment();
 var importInput = new ML.Data.TextLoader(dataPath);
 var importInput = new ML.Data.TextLoader(dataPath)
 {
 Arguments = new TextLoaderArguments
 {
 Separator = new[] { ';' },
 HasHeader = true,
 Column = new[]
 {
 new TextLoaderColumn()
 {
 Name = "Label",
 Source = new [] { new TextLoaderRange(11) },
 Type = DataKind.Num
 },

 new TextLoaderColumn()
 {
 Name = "Features",
 Source = new [] { new TextLoaderRange(0,10) },
 Type = DataKind.Num
 }
 }
 }
 };
 var importOutput = experiment.Add(importInput);

 var crossValidate = new ML.Models.CrossValidator
Expand DownExpand Up@@ -324,7 +348,7 @@ public void TestCrossValidationMacro()
 Assert.True(b);
 double val = 0;
 getter(ref val);
 Assert.Equal(3.32, val, 1);
 Assert.Equal(0.58, val, 1);
 b = cursor.MoveNext();
 Assert.False(b);
 }
Expand Down

23 changes: 13 additions & 10 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -910,7 +910,7 @@ public void EntryPointTextToKeyToText()
 }

 private void RunTrainScoreEvaluate(string learner, string evaluator, string dataPath, string warningsPath, string overallMetricsPath,
 string instanceMetricsPath, string confusionMatrixPath = null)
 string instanceMetricsPath, string confusionMatrixPath = null, string loader = null)
 {
 string inputGraph = string.Format(@"
 {{
Expand All@@ -919,6 +919,7 @@ private void RunTrainScoreEvaluate(string learner, string evaluator, string data
 'Name': 'Data.CustomTextLoader',
 'Inputs': {{
 'InputFile': '$file'
 {8}
 }},
 'Outputs': {{
 'Data': '$AllData'
Expand DownExpand Up@@ -978,7 +979,8 @@ private void RunTrainScoreEvaluate(string learner, string evaluator, string data
 }}
 }}", learner, evaluator, EscapePath(dataPath), EscapePath(warningsPath), EscapePath(overallMetricsPath), EscapePath(instanceMetricsPath),
 confusionMatrixPath != null ? ", 'ConfusionMatrix': '$ConfusionMatrix'" : "",
 confusionMatrixPath != null ? string.Format(", 'ConfusionMatrix' : '{0}'", EscapePath(confusionMatrixPath)) : "");
 confusionMatrixPath != null ? string.Format(", 'ConfusionMatrix' : '{0}'", EscapePath(confusionMatrixPath)) : "",
 string.IsNullOrWhiteSpace(loader) ? "" : string.Format(",'CustomSchema': '{0}'", loader));

 var jsonPath = DeleteOutputPath("graph.json");
 File.WriteAllLines(jsonPath, new[] { inputGraph });
Expand DownExpand Up@@ -1036,15 +1038,16 @@ public void EntryPointEvaluateMultiClass()
 Assert.Equal(3, CountRows(loader));
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact]
 public void EntryPointEvaluateRegression()
 {
 var dataPath = GetDataPath("housing.txt");
 var dataPath = GetDataPath(TestDatasets.winequality.trainFilename);
 var warningsPath = DeleteOutputPath("warnings.idv");
 var overallMetricsPath = DeleteOutputPath("overall.idv");
 var instanceMetricsPath = DeleteOutputPath("instance.idv");

 RunTrainScoreEvaluate("Trainers.StochasticDualCoordinateAscentRegressor", "Models.RegressionEvaluator", dataPath, warningsPath, overallMetricsPath, instanceMetricsPath);
 RunTrainScoreEvaluate("Trainers.StochasticDualCoordinateAscentRegressor", "Models.RegressionEvaluator",
 dataPath, warningsPath, overallMetricsPath, instanceMetricsPath, loader: TestDatasets.winequality.loaderSettings);

 using (var loader = new BinaryLoader(Env, new BinaryLoader.Arguments(), warningsPath))
 Assert.Equal(0, CountRows(loader));
Expand All@@ -1053,7 +1056,7 @@ public void EntryPointEvaluateRegression()
 Assert.Equal(1, CountRows(loader));

 using (var loader = new BinaryLoader(Env, new BinaryLoader.Arguments(), instanceMetricsPath))
 Assert.Equal(104, CountRows(loader));
 Assert.Equal(975, CountRows(loader));
 }

 [Fact]
Expand All@@ -1068,10 +1071,10 @@ public void EntryPointSDCAMultiClass()
 TestEntryPointRoutine("iris.txt", "Trainers.StochasticDualCoordinateAscentClassifier");
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact()]
 public void EntryPointSDCARegression()
 {
 TestEntryPointRoutine("housing.txt", "Trainers.StochasticDualCoordinateAscentRegressor");
 TestEntryPointRoutine(TestDatasets.winequality.trainFilename, "Trainers.StochasticDualCoordinateAscentRegressor", loader: TestDatasets.winequality.loaderSettings);
 }

 [Fact]
Expand DownExpand Up@@ -1142,10 +1145,10 @@ public void EntryPointHogwildSGD()
 TestEntryPointRoutine("breast-cancer.txt", "Trainers.StochasticGradientDescentBinaryClassifier");
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact()]
 public void EntryPointPoissonRegression()
 {
 TestEntryPointRoutine("housing.txt", "Trainers.PoissonRegressor");
 TestEntryPointRoutine(TestDatasets.winequality.trainFilename, "Trainers.PoissonRegressor", loader: TestDatasets.winequality.loaderSettings);
 }

 [Fact]
Expand Down

8 changes: 8 additions & 0 deletions
test/Microsoft.ML.TestFramework/Datasets.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,6 +152,14 @@ public static class TestDatasets
 testFilename = "housing.txt"
 };

 public static TestDataset winequality = new TestDataset
 {
 name = "wine",
 trainFilename = "external/winequality-white.csv",
 testFilename = "external/winequality-white.csv",
 loaderSettings = "col=Label:R4:11 col=Features:R4:0-10 sep=; header+"
 };

 public static TestDataset msm = new TestDataset
 {
 // REVIEW: Why is the MSM train set smaller than the test set? Reverse these!
Expand Down

2 changes: 1 addition & 1 deletion
test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,6 @@

 <ItemGroup>
 <NativeAssemblyReference Include="CpuMathNative" />
<NativeAssemblyReference Include="FastTreeNative" />
<NativeAssemblyReference Include="FastTreeNative" />
 </ItemGroup>
</Project>

, '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
switch housing dataset to wine#170

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 14 commits into

from

May 23, 2018
 Merged


switch housing dataset to wine
#170
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e6fde16

replace housing uci dataset to wine quality

May 4, 2018
dd969aa

proper order

May 4, 2018
8777327

unix slash

May 4, 2018
ccfad34

download only if they not present

May 16, 2018
40f1574

Merge branch 'master' into ivanidze/switch_housing_dataset_to_wine

May 16, 2018
a49ed52

remove parenthesis

May 16, 2018
dc2be36

fix build

May 16, 2018
ee307bf

Replace Result to DestinationFile

May 16, 2018
0353bb7

move Url to subelement

May 18, 2018
7d76cd3

formatting

May 18, 2018
08a2a00

switch to sub-elements

May 22, 2018
45478c2

merge from master

May 22, 2018
f9bcb74

Update CrossValidationMacro

May 22, 2018
72abef1

create dataset

May 22, 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


2 changes: 2 additions & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,3 +328,5 @@ ASALocalRun/

# MSBuild Binary and Structured Log
*.binlog
# Ignore external test datasets.
/test/data/external/

18 changes: 16 additions & 2 deletions
build.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />

 <Import Project="$(ToolsDir)VersionTools.targets" Condition="Exists('$(ToolsDir)VersionTools.targets')" />

 <UsingTask TaskName="DownloadFilesFromUrl" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll"/>
 <PropertyGroup>
 <!-- To disable the restoration of packages, set RestoreDuringBuild=false or pass /p:RestoreDuringBuild=false.-->
 <RestoreDuringBuild Condition="'$(RestoreDuringBuild)'==''">true</RestoreDuringBuild>
Expand All@@ -33,6 +33,7 @@
 RestoreProjects;
 BuildNative;
 $(TraversalBuildDependsOn);
 DownloadExternalTestFiles;
 RunTests;
 </TraversalBuildDependsOn>
 </PropertyGroup>
Expand All@@ -56,13 +57,26 @@
 <ItemGroup>
 <PkgProject Include="pkg\**\*.nupkgproj" />
 </ItemGroup>

 <MSBuild Projects="@(PkgProject)"
 Targets="Restore" />
 <MSBuild Projects="@(PkgProject)"
 Targets="Pack" />
 </Target>

 <ItemGroup>
 <TestFile Include="$(MSBuildThisFileDirectory)/test/data/external/winequality-white.csv"
 Url="https://archive.ics.uci.edu/ml/machine-learning-databases/wine-quality/winequality-white.csv"
 DestinationFile="$(MSBuildThisFileDirectory)test/data/external/winequality-white.csv" />
 </ItemGroup>

 <Target Name="DownloadExternalTestFiles" Inputs="@(TestFile)" Outputs="%(TestFile.DestinationFile)">
 <Message Importance="High" Text="Downloading external test files... %(TestFile.DestinationFile)" />
 <DownloadFilesFromUrl Items="@(TestFile)"
 DestinationDir="test/data/external"
 TreatErrorsAsWarnings="true"/>
 </Target>

 <Target Name="RunTests" Condition="'$(RunTests)'=='true'">
 <MSBuild Projects="test\run-tests.proj"
 Targets="RunTests" />
Expand Down

32 changes: 28 additions & 4 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs

View file


Open in desktop

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

using ML = Microsoft.ML;
using Microsoft.ML.Runtime;
using Microsoft.ML.Data;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.TestFramework;
Expand DownExpand Up@@ -269,10 +270,10 @@ public void TestCrossValidationBinaryMacro()
 }
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact]
 public void TestCrossValidationMacro()
 {
 var dataPath = GetDataPath(@"housing.txt");
 var dataPath = GetDataPath(TestDatasets.winequality.trainFilename);
 using (var env = new TlcEnvironment())
 {
 var subGraph = env.CreateExperiment();
Expand All@@ -295,7 +296,30 @@ public void TestCrossValidationMacro()
 var modelCombineOutput = subGraph.Add(modelCombine);

 var experiment = env.CreateExperiment();
 var importInput = new ML.Data.TextLoader(dataPath);
 var importInput = new ML.Data.TextLoader(dataPath)
 {
 Arguments = new TextLoaderArguments
 {
 Separator = new[] { ';' },
 HasHeader = true,
 Column = new[]
 {
 new TextLoaderColumn()
 {
 Name = "Label",
 Source = new [] { new TextLoaderRange(11) },
 Type = DataKind.Num
 },

 new TextLoaderColumn()
 {
 Name = "Features",
 Source = new [] { new TextLoaderRange(0,10) },
 Type = DataKind.Num
 }
 }
 }
 };
 var importOutput = experiment.Add(importInput);

 var crossValidate = new ML.Models.CrossValidator
Expand DownExpand Up@@ -324,7 +348,7 @@ public void TestCrossValidationMacro()
 Assert.True(b);
 double val = 0;
 getter(ref val);
 Assert.Equal(3.32, val, 1);
 Assert.Equal(0.58, val, 1);
 b = cursor.MoveNext();
 Assert.False(b);
 }
Expand Down

23 changes: 13 additions & 10 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -910,7 +910,7 @@ public void EntryPointTextToKeyToText()
 }

 private void RunTrainScoreEvaluate(string learner, string evaluator, string dataPath, string warningsPath, string overallMetricsPath,
 string instanceMetricsPath, string confusionMatrixPath = null)
 string instanceMetricsPath, string confusionMatrixPath = null, string loader = null)
 {
 string inputGraph = string.Format(@"
 {{
Expand All@@ -919,6 +919,7 @@ private void RunTrainScoreEvaluate(string learner, string evaluator, string data
 'Name': 'Data.CustomTextLoader',
 'Inputs': {{
 'InputFile': '$file'
 {8}
 }},
 'Outputs': {{
 'Data': '$AllData'
Expand DownExpand Up@@ -978,7 +979,8 @@ private void RunTrainScoreEvaluate(string learner, string evaluator, string data
 }}
 }}", learner, evaluator, EscapePath(dataPath), EscapePath(warningsPath), EscapePath(overallMetricsPath), EscapePath(instanceMetricsPath),
 confusionMatrixPath != null ? ", 'ConfusionMatrix': '$ConfusionMatrix'" : "",
 confusionMatrixPath != null ? string.Format(", 'ConfusionMatrix' : '{0}'", EscapePath(confusionMatrixPath)) : "");
 confusionMatrixPath != null ? string.Format(", 'ConfusionMatrix' : '{0}'", EscapePath(confusionMatrixPath)) : "",
 string.IsNullOrWhiteSpace(loader) ? "" : string.Format(",'CustomSchema': '{0}'", loader));

 var jsonPath = DeleteOutputPath("graph.json");
 File.WriteAllLines(jsonPath, new[] { inputGraph });
Expand DownExpand Up@@ -1036,15 +1038,16 @@ public void EntryPointEvaluateMultiClass()
 Assert.Equal(3, CountRows(loader));
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact]
 public void EntryPointEvaluateRegression()
 {
 var dataPath = GetDataPath("housing.txt");
 var dataPath = GetDataPath(TestDatasets.winequality.trainFilename);
 var warningsPath = DeleteOutputPath("warnings.idv");
 var overallMetricsPath = DeleteOutputPath("overall.idv");
 var instanceMetricsPath = DeleteOutputPath("instance.idv");

 RunTrainScoreEvaluate("Trainers.StochasticDualCoordinateAscentRegressor", "Models.RegressionEvaluator", dataPath, warningsPath, overallMetricsPath, instanceMetricsPath);
 RunTrainScoreEvaluate("Trainers.StochasticDualCoordinateAscentRegressor", "Models.RegressionEvaluator",
 dataPath, warningsPath, overallMetricsPath, instanceMetricsPath, loader: TestDatasets.winequality.loaderSettings);

 using (var loader = new BinaryLoader(Env, new BinaryLoader.Arguments(), warningsPath))
 Assert.Equal(0, CountRows(loader));
Expand All@@ -1053,7 +1056,7 @@ public void EntryPointEvaluateRegression()
 Assert.Equal(1, CountRows(loader));

 using (var loader = new BinaryLoader(Env, new BinaryLoader.Arguments(), instanceMetricsPath))
 Assert.Equal(104, CountRows(loader));
 Assert.Equal(975, CountRows(loader));
 }

 [Fact]
Expand All@@ -1068,10 +1071,10 @@ public void EntryPointSDCAMultiClass()
 TestEntryPointRoutine("iris.txt", "Trainers.StochasticDualCoordinateAscentClassifier");
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact()]
 public void EntryPointSDCARegression()
 {
 TestEntryPointRoutine("housing.txt", "Trainers.StochasticDualCoordinateAscentRegressor");
 TestEntryPointRoutine(TestDatasets.winequality.trainFilename, "Trainers.StochasticDualCoordinateAscentRegressor", loader: TestDatasets.winequality.loaderSettings);
 }

 [Fact]
Expand DownExpand Up@@ -1142,10 +1145,10 @@ public void EntryPointHogwildSGD()
 TestEntryPointRoutine("breast-cancer.txt", "Trainers.StochasticGradientDescentBinaryClassifier");
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact()]
 public void EntryPointPoissonRegression()
 {
 TestEntryPointRoutine("housing.txt", "Trainers.PoissonRegressor");
 TestEntryPointRoutine(TestDatasets.winequality.trainFilename, "Trainers.PoissonRegressor", loader: TestDatasets.winequality.loaderSettings);
 }

 [Fact]
Expand Down

8 changes: 8 additions & 0 deletions
test/Microsoft.ML.TestFramework/Datasets.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,6 +152,14 @@ public static class TestDatasets
 testFilename = "housing.txt"
 };

 public static TestDataset winequality = new TestDataset
 {
 name = "wine",
 trainFilename = "external/winequality-white.csv",
 testFilename = "external/winequality-white.csv",
 loaderSettings = "col=Label:R4:11 col=Features:R4:0-10 sep=; header+"
 };

 public static TestDataset msm = new TestDataset
 {
 // REVIEW: Why is the MSM train set smaller than the test set? Reverse these!
Expand Down

2 changes: 1 addition & 1 deletion
test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,6 @@

 <ItemGroup>
 <NativeAssemblyReference Include="CpuMathNative" />
<NativeAssemblyReference Include="FastTreeNative" />
<NativeAssemblyReference Include="FastTreeNative" />
 </ItemGroup>
</Project>

, '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
switch housing dataset to wine#170

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 14 commits into

from

May 23, 2018
 Merged


switch housing dataset to wine
#170
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e6fde16

replace housing uci dataset to wine quality

May 4, 2018
dd969aa

proper order

May 4, 2018
8777327

unix slash

May 4, 2018
ccfad34

download only if they not present

May 16, 2018
40f1574

Merge branch 'master' into ivanidze/switch_housing_dataset_to_wine

May 16, 2018
a49ed52

remove parenthesis

May 16, 2018
dc2be36

fix build

May 16, 2018
ee307bf

Replace Result to DestinationFile

May 16, 2018
0353bb7

move Url to subelement

May 18, 2018
7d76cd3

formatting

May 18, 2018
08a2a00

switch to sub-elements

May 22, 2018
45478c2

merge from master

May 22, 2018
f9bcb74

Update CrossValidationMacro

May 22, 2018
72abef1

create dataset

May 22, 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


2 changes: 2 additions & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,3 +328,5 @@ ASALocalRun/

# MSBuild Binary and Structured Log
*.binlog
# Ignore external test datasets.
/test/data/external/

18 changes: 16 additions & 2 deletions
build.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />

 <Import Project="$(ToolsDir)VersionTools.targets" Condition="Exists('$(ToolsDir)VersionTools.targets')" />

 <UsingTask TaskName="DownloadFilesFromUrl" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll"/>
 <PropertyGroup>
 <!-- To disable the restoration of packages, set RestoreDuringBuild=false or pass /p:RestoreDuringBuild=false.-->
 <RestoreDuringBuild Condition="'$(RestoreDuringBuild)'==''">true</RestoreDuringBuild>
Expand All@@ -33,6 +33,7 @@
 RestoreProjects;
 BuildNative;
 $(TraversalBuildDependsOn);
 DownloadExternalTestFiles;
 RunTests;
 </TraversalBuildDependsOn>
 </PropertyGroup>
Expand All@@ -56,13 +57,26 @@
 <ItemGroup>
 <PkgProject Include="pkg\**\*.nupkgproj" />
 </ItemGroup>

 <MSBuild Projects="@(PkgProject)"
 Targets="Restore" />
 <MSBuild Projects="@(PkgProject)"
 Targets="Pack" />
 </Target>

 <ItemGroup>
 <TestFile Include="$(MSBuildThisFileDirectory)/test/data/external/winequality-white.csv"
 Url="https://archive.ics.uci.edu/ml/machine-learning-databases/wine-quality/winequality-white.csv"
 DestinationFile="$(MSBuildThisFileDirectory)test/data/external/winequality-white.csv" />
 </ItemGroup>

 <Target Name="DownloadExternalTestFiles" Inputs="@(TestFile)" Outputs="%(TestFile.DestinationFile)">
 <Message Importance="High" Text="Downloading external test files... %(TestFile.DestinationFile)" />
 <DownloadFilesFromUrl Items="@(TestFile)"
 DestinationDir="test/data/external"
 TreatErrorsAsWarnings="true"/>
 </Target>

 <Target Name="RunTests" Condition="'$(RunTests)'=='true'">
 <MSBuild Projects="test\run-tests.proj"
 Targets="RunTests" />
Expand Down

32 changes: 28 additions & 4 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs

View file


Open in desktop

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

using ML = Microsoft.ML;
using Microsoft.ML.Runtime;
using Microsoft.ML.Data;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.TestFramework;
Expand DownExpand Up@@ -269,10 +270,10 @@ public void TestCrossValidationBinaryMacro()
 }
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact]
 public void TestCrossValidationMacro()
 {
 var dataPath = GetDataPath(@"housing.txt");
 var dataPath = GetDataPath(TestDatasets.winequality.trainFilename);
 using (var env = new TlcEnvironment())
 {
 var subGraph = env.CreateExperiment();
Expand All@@ -295,7 +296,30 @@ public void TestCrossValidationMacro()
 var modelCombineOutput = subGraph.Add(modelCombine);

 var experiment = env.CreateExperiment();
 var importInput = new ML.Data.TextLoader(dataPath);
 var importInput = new ML.Data.TextLoader(dataPath)
 {
 Arguments = new TextLoaderArguments
 {
 Separator = new[] { ';' },
 HasHeader = true,
 Column = new[]
 {
 new TextLoaderColumn()
 {
 Name = "Label",
 Source = new [] { new TextLoaderRange(11) },
 Type = DataKind.Num
 },

 new TextLoaderColumn()
 {
 Name = "Features",
 Source = new [] { new TextLoaderRange(0,10) },
 Type = DataKind.Num
 }
 }
 }
 };
 var importOutput = experiment.Add(importInput);

 var crossValidate = new ML.Models.CrossValidator
Expand DownExpand Up@@ -324,7 +348,7 @@ public void TestCrossValidationMacro()
 Assert.True(b);
 double val = 0;
 getter(ref val);
 Assert.Equal(3.32, val, 1);
 Assert.Equal(0.58, val, 1);
 b = cursor.MoveNext();
 Assert.False(b);
 }
Expand Down

23 changes: 13 additions & 10 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -910,7 +910,7 @@ public void EntryPointTextToKeyToText()
 }

 private void RunTrainScoreEvaluate(string learner, string evaluator, string dataPath, string warningsPath, string overallMetricsPath,
 string instanceMetricsPath, string confusionMatrixPath = null)
 string instanceMetricsPath, string confusionMatrixPath = null, string loader = null)
 {
 string inputGraph = string.Format(@"
 {{
Expand All@@ -919,6 +919,7 @@ private void RunTrainScoreEvaluate(string learner, string evaluator, string data
 'Name': 'Data.CustomTextLoader',
 'Inputs': {{
 'InputFile': '$file'
 {8}
 }},
 'Outputs': {{
 'Data': '$AllData'
Expand DownExpand Up@@ -978,7 +979,8 @@ private void RunTrainScoreEvaluate(string learner, string evaluator, string data
 }}
 }}", learner, evaluator, EscapePath(dataPath), EscapePath(warningsPath), EscapePath(overallMetricsPath), EscapePath(instanceMetricsPath),
 confusionMatrixPath != null ? ", 'ConfusionMatrix': '$ConfusionMatrix'" : "",
 confusionMatrixPath != null ? string.Format(", 'ConfusionMatrix' : '{0}'", EscapePath(confusionMatrixPath)) : "");
 confusionMatrixPath != null ? string.Format(", 'ConfusionMatrix' : '{0}'", EscapePath(confusionMatrixPath)) : "",
 string.IsNullOrWhiteSpace(loader) ? "" : string.Format(",'CustomSchema': '{0}'", loader));

 var jsonPath = DeleteOutputPath("graph.json");
 File.WriteAllLines(jsonPath, new[] { inputGraph });
Expand DownExpand Up@@ -1036,15 +1038,16 @@ public void EntryPointEvaluateMultiClass()
 Assert.Equal(3, CountRows(loader));
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact]
 public void EntryPointEvaluateRegression()
 {
 var dataPath = GetDataPath("housing.txt");
 var dataPath = GetDataPath(TestDatasets.winequality.trainFilename);
 var warningsPath = DeleteOutputPath("warnings.idv");
 var overallMetricsPath = DeleteOutputPath("overall.idv");
 var instanceMetricsPath = DeleteOutputPath("instance.idv");

 RunTrainScoreEvaluate("Trainers.StochasticDualCoordinateAscentRegressor", "Models.RegressionEvaluator", dataPath, warningsPath, overallMetricsPath, instanceMetricsPath);
 RunTrainScoreEvaluate("Trainers.StochasticDualCoordinateAscentRegressor", "Models.RegressionEvaluator",
 dataPath, warningsPath, overallMetricsPath, instanceMetricsPath, loader: TestDatasets.winequality.loaderSettings);

 using (var loader = new BinaryLoader(Env, new BinaryLoader.Arguments(), warningsPath))
 Assert.Equal(0, CountRows(loader));
Expand All@@ -1053,7 +1056,7 @@ public void EntryPointEvaluateRegression()
 Assert.Equal(1, CountRows(loader));

 using (var loader = new BinaryLoader(Env, new BinaryLoader.Arguments(), instanceMetricsPath))
 Assert.Equal(104, CountRows(loader));
 Assert.Equal(975, CountRows(loader));
 }

 [Fact]
Expand All@@ -1068,10 +1071,10 @@ public void EntryPointSDCAMultiClass()
 TestEntryPointRoutine("iris.txt", "Trainers.StochasticDualCoordinateAscentClassifier");
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact()]
 public void EntryPointSDCARegression()
 {
 TestEntryPointRoutine("housing.txt", "Trainers.StochasticDualCoordinateAscentRegressor");
 TestEntryPointRoutine(TestDatasets.winequality.trainFilename, "Trainers.StochasticDualCoordinateAscentRegressor", loader: TestDatasets.winequality.loaderSettings);
 }

 [Fact]
Expand DownExpand Up@@ -1142,10 +1145,10 @@ public void EntryPointHogwildSGD()
 TestEntryPointRoutine("breast-cancer.txt", "Trainers.StochasticGradientDescentBinaryClassifier");
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact()]
 public void EntryPointPoissonRegression()
 {
 TestEntryPointRoutine("housing.txt", "Trainers.PoissonRegressor");
 TestEntryPointRoutine(TestDatasets.winequality.trainFilename, "Trainers.PoissonRegressor", loader: TestDatasets.winequality.loaderSettings);
 }

 [Fact]
Expand Down

8 changes: 8 additions & 0 deletions
test/Microsoft.ML.TestFramework/Datasets.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,6 +152,14 @@ public static class TestDatasets
 testFilename = "housing.txt"
 };

 public static TestDataset winequality = new TestDataset
 {
 name = "wine",
 trainFilename = "external/winequality-white.csv",
 testFilename = "external/winequality-white.csv",
 loaderSettings = "col=Label:R4:11 col=Features:R4:0-10 sep=; header+"
 };

 public static TestDataset msm = new TestDataset
 {
 // REVIEW: Why is the MSM train set smaller than the test set? Reverse these!
Expand Down

2 changes: 1 addition & 1 deletion
test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,6 @@

 <ItemGroup>
 <NativeAssemblyReference Include="CpuMathNative" />
<NativeAssemblyReference Include="FastTreeNative" />
<NativeAssemblyReference Include="FastTreeNative" />
 </ItemGroup>
</Project>

, '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
switch housing dataset to wine#170

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 14 commits into

from

May 23, 2018
 Merged


switch housing dataset to wine
#170
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e6fde16

replace housing uci dataset to wine quality

May 4, 2018
dd969aa

proper order

May 4, 2018
8777327

unix slash

May 4, 2018
ccfad34

download only if they not present

May 16, 2018
40f1574

Merge branch 'master' into ivanidze/switch_housing_dataset_to_wine

May 16, 2018
a49ed52

remove parenthesis

May 16, 2018
dc2be36

fix build

May 16, 2018
ee307bf

Replace Result to DestinationFile

May 16, 2018
0353bb7

move Url to subelement

May 18, 2018
7d76cd3

formatting

May 18, 2018
08a2a00

switch to sub-elements

May 22, 2018
45478c2

merge from master

May 22, 2018
f9bcb74

Update CrossValidationMacro

May 22, 2018
72abef1

create dataset

May 22, 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


2 changes: 2 additions & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,3 +328,5 @@ ASALocalRun/

# MSBuild Binary and Structured Log
*.binlog
# Ignore external test datasets.
/test/data/external/

18 changes: 16 additions & 2 deletions
build.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />

 <Import Project="$(ToolsDir)VersionTools.targets" Condition="Exists('$(ToolsDir)VersionTools.targets')" />

 <UsingTask TaskName="DownloadFilesFromUrl" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll"/>
 <PropertyGroup>
 <!-- To disable the restoration of packages, set RestoreDuringBuild=false or pass /p:RestoreDuringBuild=false.-->
 <RestoreDuringBuild Condition="'$(RestoreDuringBuild)'==''">true</RestoreDuringBuild>
Expand All@@ -33,6 +33,7 @@
 RestoreProjects;
 BuildNative;
 $(TraversalBuildDependsOn);
 DownloadExternalTestFiles;
 RunTests;
 </TraversalBuildDependsOn>
 </PropertyGroup>
Expand All@@ -56,13 +57,26 @@
 <ItemGroup>
 <PkgProject Include="pkg\**\*.nupkgproj" />
 </ItemGroup>

 <MSBuild Projects="@(PkgProject)"
 Targets="Restore" />
 <MSBuild Projects="@(PkgProject)"
 Targets="Pack" />
 </Target>

 <ItemGroup>
 <TestFile Include="$(MSBuildThisFileDirectory)/test/data/external/winequality-white.csv"
 Url="https://archive.ics.uci.edu/ml/machine-learning-databases/wine-quality/winequality-white.csv"
 DestinationFile="$(MSBuildThisFileDirectory)test/data/external/winequality-white.csv" />
 </ItemGroup>

 <Target Name="DownloadExternalTestFiles" Inputs="@(TestFile)" Outputs="%(TestFile.DestinationFile)">
 <Message Importance="High" Text="Downloading external test files... %(TestFile.DestinationFile)" />
 <DownloadFilesFromUrl Items="@(TestFile)"
 DestinationDir="test/data/external"
 TreatErrorsAsWarnings="true"/>
 </Target>

 <Target Name="RunTests" Condition="'$(RunTests)'=='true'">
 <MSBuild Projects="test\run-tests.proj"
 Targets="RunTests" />
Expand Down

32 changes: 28 additions & 4 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs

View file


Open in desktop

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

using ML = Microsoft.ML;
using Microsoft.ML.Runtime;
using Microsoft.ML.Data;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.TestFramework;
Expand DownExpand Up@@ -269,10 +270,10 @@ public void TestCrossValidationBinaryMacro()
 }
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact]
 public void TestCrossValidationMacro()
 {
 var dataPath = GetDataPath(@"housing.txt");
 var dataPath = GetDataPath(TestDatasets.winequality.trainFilename);
 using (var env = new TlcEnvironment())
 {
 var subGraph = env.CreateExperiment();
Expand All@@ -295,7 +296,30 @@ public void TestCrossValidationMacro()
 var modelCombineOutput = subGraph.Add(modelCombine);

 var experiment = env.CreateExperiment();
 var importInput = new ML.Data.TextLoader(dataPath);
 var importInput = new ML.Data.TextLoader(dataPath)
 {
 Arguments = new TextLoaderArguments
 {
 Separator = new[] { ';' },
 HasHeader = true,
 Column = new[]
 {
 new TextLoaderColumn()
 {
 Name = "Label",
 Source = new [] { new TextLoaderRange(11) },
 Type = DataKind.Num
 },

 new TextLoaderColumn()
 {
 Name = "Features",
 Source = new [] { new TextLoaderRange(0,10) },
 Type = DataKind.Num
 }
 }
 }
 };
 var importOutput = experiment.Add(importInput);

 var crossValidate = new ML.Models.CrossValidator
Expand DownExpand Up@@ -324,7 +348,7 @@ public void TestCrossValidationMacro()
 Assert.True(b);
 double val = 0;
 getter(ref val);
 Assert.Equal(3.32, val, 1);
 Assert.Equal(0.58, val, 1);
 b = cursor.MoveNext();
 Assert.False(b);
 }
Expand Down

23 changes: 13 additions & 10 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -910,7 +910,7 @@ public void EntryPointTextToKeyToText()
 }

 private void RunTrainScoreEvaluate(string learner, string evaluator, string dataPath, string warningsPath, string overallMetricsPath,
 string instanceMetricsPath, string confusionMatrixPath = null)
 string instanceMetricsPath, string confusionMatrixPath = null, string loader = null)
 {
 string inputGraph = string.Format(@"
 {{
Expand All@@ -919,6 +919,7 @@ private void RunTrainScoreEvaluate(string learner, string evaluator, string data
 'Name': 'Data.CustomTextLoader',
 'Inputs': {{
 'InputFile': '$file'
 {8}
 }},
 'Outputs': {{
 'Data': '$AllData'
Expand DownExpand Up@@ -978,7 +979,8 @@ private void RunTrainScoreEvaluate(string learner, string evaluator, string data
 }}
 }}", learner, evaluator, EscapePath(dataPath), EscapePath(warningsPath), EscapePath(overallMetricsPath), EscapePath(instanceMetricsPath),
 confusionMatrixPath != null ? ", 'ConfusionMatrix': '$ConfusionMatrix'" : "",
 confusionMatrixPath != null ? string.Format(", 'ConfusionMatrix' : '{0}'", EscapePath(confusionMatrixPath)) : "");
 confusionMatrixPath != null ? string.Format(", 'ConfusionMatrix' : '{0}'", EscapePath(confusionMatrixPath)) : "",
 string.IsNullOrWhiteSpace(loader) ? "" : string.Format(",'CustomSchema': '{0}'", loader));

 var jsonPath = DeleteOutputPath("graph.json");
 File.WriteAllLines(jsonPath, new[] { inputGraph });
Expand DownExpand Up@@ -1036,15 +1038,16 @@ public void EntryPointEvaluateMultiClass()
 Assert.Equal(3, CountRows(loader));
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact]
 public void EntryPointEvaluateRegression()
 {
 var dataPath = GetDataPath("housing.txt");
 var dataPath = GetDataPath(TestDatasets.winequality.trainFilename);
 var warningsPath = DeleteOutputPath("warnings.idv");
 var overallMetricsPath = DeleteOutputPath("overall.idv");
 var instanceMetricsPath = DeleteOutputPath("instance.idv");

 RunTrainScoreEvaluate("Trainers.StochasticDualCoordinateAscentRegressor", "Models.RegressionEvaluator", dataPath, warningsPath, overallMetricsPath, instanceMetricsPath);
 RunTrainScoreEvaluate("Trainers.StochasticDualCoordinateAscentRegressor", "Models.RegressionEvaluator",
 dataPath, warningsPath, overallMetricsPath, instanceMetricsPath, loader: TestDatasets.winequality.loaderSettings);

 using (var loader = new BinaryLoader(Env, new BinaryLoader.Arguments(), warningsPath))
 Assert.Equal(0, CountRows(loader));
Expand All@@ -1053,7 +1056,7 @@ public void EntryPointEvaluateRegression()
 Assert.Equal(1, CountRows(loader));

 using (var loader = new BinaryLoader(Env, new BinaryLoader.Arguments(), instanceMetricsPath))
 Assert.Equal(104, CountRows(loader));
 Assert.Equal(975, CountRows(loader));
 }

 [Fact]
Expand All@@ -1068,10 +1071,10 @@ public void EntryPointSDCAMultiClass()
 TestEntryPointRoutine("iris.txt", "Trainers.StochasticDualCoordinateAscentClassifier");
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact()]
 public void EntryPointSDCARegression()
 {
 TestEntryPointRoutine("housing.txt", "Trainers.StochasticDualCoordinateAscentRegressor");
 TestEntryPointRoutine(TestDatasets.winequality.trainFilename, "Trainers.StochasticDualCoordinateAscentRegressor", loader: TestDatasets.winequality.loaderSettings);
 }

 [Fact]
Expand DownExpand Up@@ -1142,10 +1145,10 @@ public void EntryPointHogwildSGD()
 TestEntryPointRoutine("breast-cancer.txt", "Trainers.StochasticGradientDescentBinaryClassifier");
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact()]
 public void EntryPointPoissonRegression()
 {
 TestEntryPointRoutine("housing.txt", "Trainers.PoissonRegressor");
 TestEntryPointRoutine(TestDatasets.winequality.trainFilename, "Trainers.PoissonRegressor", loader: TestDatasets.winequality.loaderSettings);
 }

 [Fact]
Expand Down

8 changes: 8 additions & 0 deletions
test/Microsoft.ML.TestFramework/Datasets.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,6 +152,14 @@ public static class TestDatasets
 testFilename = "housing.txt"
 };

 public static TestDataset winequality = new TestDataset
 {
 name = "wine",
 trainFilename = "external/winequality-white.csv",
 testFilename = "external/winequality-white.csv",
 loaderSettings = "col=Label:R4:11 col=Features:R4:0-10 sep=; header+"
 };

 public static TestDataset msm = new TestDataset
 {
 // REVIEW: Why is the MSM train set smaller than the test set? Reverse these!
Expand Down

2 changes: 1 addition & 1 deletion
test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,6 @@

 <ItemGroup>
 <NativeAssemblyReference Include="CpuMathNative" />
<NativeAssemblyReference Include="FastTreeNative" />
<NativeAssemblyReference Include="FastTreeNative" />
 </ItemGroup>
</Project>

, '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
switch housing dataset to wine#170

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 14 commits into

from

May 23, 2018
 Merged


switch housing dataset to wine
#170
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e6fde16

replace housing uci dataset to wine quality

May 4, 2018
dd969aa

proper order

May 4, 2018
8777327

unix slash

May 4, 2018
ccfad34

download only if they not present

May 16, 2018
40f1574

Merge branch 'master' into ivanidze/switch_housing_dataset_to_wine

May 16, 2018
a49ed52

remove parenthesis

May 16, 2018
dc2be36

fix build

May 16, 2018
ee307bf

Replace Result to DestinationFile

May 16, 2018
0353bb7

move Url to subelement

May 18, 2018
7d76cd3

formatting

May 18, 2018
08a2a00

switch to sub-elements

May 22, 2018
45478c2

merge from master

May 22, 2018
f9bcb74

Update CrossValidationMacro

May 22, 2018
72abef1

create dataset

May 22, 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


2 changes: 2 additions & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,3 +328,5 @@ ASALocalRun/

# MSBuild Binary and Structured Log
*.binlog
# Ignore external test datasets.
/test/data/external/

18 changes: 16 additions & 2 deletions
build.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />

 <Import Project="$(ToolsDir)VersionTools.targets" Condition="Exists('$(ToolsDir)VersionTools.targets')" />

 <UsingTask TaskName="DownloadFilesFromUrl" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll"/>
 <PropertyGroup>
 <!-- To disable the restoration of packages, set RestoreDuringBuild=false or pass /p:RestoreDuringBuild=false.-->
 <RestoreDuringBuild Condition="'$(RestoreDuringBuild)'==''">true</RestoreDuringBuild>
Expand All@@ -33,6 +33,7 @@
 RestoreProjects;
 BuildNative;
 $(TraversalBuildDependsOn);
 DownloadExternalTestFiles;
 RunTests;
 </TraversalBuildDependsOn>
 </PropertyGroup>
Expand All@@ -56,13 +57,26 @@
 <ItemGroup>
 <PkgProject Include="pkg\**\*.nupkgproj" />
 </ItemGroup>

 <MSBuild Projects="@(PkgProject)"
 Targets="Restore" />
 <MSBuild Projects="@(PkgProject)"
 Targets="Pack" />
 </Target>

 <ItemGroup>
 <TestFile Include="$(MSBuildThisFileDirectory)/test/data/external/winequality-white.csv"
 Url="https://archive.ics.uci.edu/ml/machine-learning-databases/wine-quality/winequality-white.csv"
 DestinationFile="$(MSBuildThisFileDirectory)test/data/external/winequality-white.csv" />
 </ItemGroup>

 <Target Name="DownloadExternalTestFiles" Inputs="@(TestFile)" Outputs="%(TestFile.DestinationFile)">
 <Message Importance="High" Text="Downloading external test files... %(TestFile.DestinationFile)" />
 <DownloadFilesFromUrl Items="@(TestFile)"
 DestinationDir="test/data/external"
 TreatErrorsAsWarnings="true"/>
 </Target>

 <Target Name="RunTests" Condition="'$(RunTests)'=='true'">
 <MSBuild Projects="test\run-tests.proj"
 Targets="RunTests" />
Expand Down

32 changes: 28 additions & 4 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs

View file


Open in desktop

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

using ML = Microsoft.ML;
using Microsoft.ML.Runtime;
using Microsoft.ML.Data;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.TestFramework;
Expand DownExpand Up@@ -269,10 +270,10 @@ public void TestCrossValidationBinaryMacro()
 }
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact]
 public void TestCrossValidationMacro()
 {
 var dataPath = GetDataPath(@"housing.txt");
 var dataPath = GetDataPath(TestDatasets.winequality.trainFilename);
 using (var env = new TlcEnvironment())
 {
 var subGraph = env.CreateExperiment();
Expand All@@ -295,7 +296,30 @@ public void TestCrossValidationMacro()
 var modelCombineOutput = subGraph.Add(modelCombine);

 var experiment = env.CreateExperiment();
 var importInput = new ML.Data.TextLoader(dataPath);
 var importInput = new ML.Data.TextLoader(dataPath)
 {
 Arguments = new TextLoaderArguments
 {
 Separator = new[] { ';' },
 HasHeader = true,
 Column = new[]
 {
 new TextLoaderColumn()
 {
 Name = "Label",
 Source = new [] { new TextLoaderRange(11) },
 Type = DataKind.Num
 },

 new TextLoaderColumn()
 {
 Name = "Features",
 Source = new [] { new TextLoaderRange(0,10) },
 Type = DataKind.Num
 }
 }
 }
 };
 var importOutput = experiment.Add(importInput);

 var crossValidate = new ML.Models.CrossValidator
Expand DownExpand Up@@ -324,7 +348,7 @@ public void TestCrossValidationMacro()
 Assert.True(b);
 double val = 0;
 getter(ref val);
 Assert.Equal(3.32, val, 1);
 Assert.Equal(0.58, val, 1);
 b = cursor.MoveNext();
 Assert.False(b);
 }
Expand Down

23 changes: 13 additions & 10 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -910,7 +910,7 @@ public void EntryPointTextToKeyToText()
 }

 private void RunTrainScoreEvaluate(string learner, string evaluator, string dataPath, string warningsPath, string overallMetricsPath,
 string instanceMetricsPath, string confusionMatrixPath = null)
 string instanceMetricsPath, string confusionMatrixPath = null, string loader = null)
 {
 string inputGraph = string.Format(@"
 {{
Expand All@@ -919,6 +919,7 @@ private void RunTrainScoreEvaluate(string learner, string evaluator, string data
 'Name': 'Data.CustomTextLoader',
 'Inputs': {{
 'InputFile': '$file'
 {8}
 }},
 'Outputs': {{
 'Data': '$AllData'
Expand DownExpand Up@@ -978,7 +979,8 @@ private void RunTrainScoreEvaluate(string learner, string evaluator, string data
 }}
 }}", learner, evaluator, EscapePath(dataPath), EscapePath(warningsPath), EscapePath(overallMetricsPath), EscapePath(instanceMetricsPath),
 confusionMatrixPath != null ? ", 'ConfusionMatrix': '$ConfusionMatrix'" : "",
 confusionMatrixPath != null ? string.Format(", 'ConfusionMatrix' : '{0}'", EscapePath(confusionMatrixPath)) : "");
 confusionMatrixPath != null ? string.Format(", 'ConfusionMatrix' : '{0}'", EscapePath(confusionMatrixPath)) : "",
 string.IsNullOrWhiteSpace(loader) ? "" : string.Format(",'CustomSchema': '{0}'", loader));

 var jsonPath = DeleteOutputPath("graph.json");
 File.WriteAllLines(jsonPath, new[] { inputGraph });
Expand DownExpand Up@@ -1036,15 +1038,16 @@ public void EntryPointEvaluateMultiClass()
 Assert.Equal(3, CountRows(loader));
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact]
 public void EntryPointEvaluateRegression()
 {
 var dataPath = GetDataPath("housing.txt");
 var dataPath = GetDataPath(TestDatasets.winequality.trainFilename);
 var warningsPath = DeleteOutputPath("warnings.idv");
 var overallMetricsPath = DeleteOutputPath("overall.idv");
 var instanceMetricsPath = DeleteOutputPath("instance.idv");

 RunTrainScoreEvaluate("Trainers.StochasticDualCoordinateAscentRegressor", "Models.RegressionEvaluator", dataPath, warningsPath, overallMetricsPath, instanceMetricsPath);
 RunTrainScoreEvaluate("Trainers.StochasticDualCoordinateAscentRegressor", "Models.RegressionEvaluator",
 dataPath, warningsPath, overallMetricsPath, instanceMetricsPath, loader: TestDatasets.winequality.loaderSettings);

 using (var loader = new BinaryLoader(Env, new BinaryLoader.Arguments(), warningsPath))
 Assert.Equal(0, CountRows(loader));
Expand All@@ -1053,7 +1056,7 @@ public void EntryPointEvaluateRegression()
 Assert.Equal(1, CountRows(loader));

 using (var loader = new BinaryLoader(Env, new BinaryLoader.Arguments(), instanceMetricsPath))
 Assert.Equal(104, CountRows(loader));
 Assert.Equal(975, CountRows(loader));
 }

 [Fact]
Expand All@@ -1068,10 +1071,10 @@ public void EntryPointSDCAMultiClass()
 TestEntryPointRoutine("iris.txt", "Trainers.StochasticDualCoordinateAscentClassifier");
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact()]
 public void EntryPointSDCARegression()
 {
 TestEntryPointRoutine("housing.txt", "Trainers.StochasticDualCoordinateAscentRegressor");
 TestEntryPointRoutine(TestDatasets.winequality.trainFilename, "Trainers.StochasticDualCoordinateAscentRegressor", loader: TestDatasets.winequality.loaderSettings);
 }

 [Fact]
Expand DownExpand Up@@ -1142,10 +1145,10 @@ public void EntryPointHogwildSGD()
 TestEntryPointRoutine("breast-cancer.txt", "Trainers.StochasticGradientDescentBinaryClassifier");
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact()]
 public void EntryPointPoissonRegression()
 {
 TestEntryPointRoutine("housing.txt", "Trainers.PoissonRegressor");
 TestEntryPointRoutine(TestDatasets.winequality.trainFilename, "Trainers.PoissonRegressor", loader: TestDatasets.winequality.loaderSettings);
 }

 [Fact]
Expand Down

8 changes: 8 additions & 0 deletions
test/Microsoft.ML.TestFramework/Datasets.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,6 +152,14 @@ public static class TestDatasets
 testFilename = "housing.txt"
 };

 public static TestDataset winequality = new TestDataset
 {
 name = "wine",
 trainFilename = "external/winequality-white.csv",
 testFilename = "external/winequality-white.csv",
 loaderSettings = "col=Label:R4:11 col=Features:R4:0-10 sep=; header+"
 };

 public static TestDataset msm = new TestDataset
 {
 // REVIEW: Why is the MSM train set smaller than the test set? Reverse these!
Expand Down

2 changes: 1 addition & 1 deletion
test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,6 @@

 <ItemGroup>
 <NativeAssemblyReference Include="CpuMathNative" />
<NativeAssemblyReference Include="FastTreeNative" />
<NativeAssemblyReference Include="FastTreeNative" />
 </ItemGroup>
</Project>

, '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
switch housing dataset to wine#170

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 14 commits into

from

May 23, 2018
 Merged


switch housing dataset to wine
#170
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e6fde16

replace housing uci dataset to wine quality

May 4, 2018
dd969aa

proper order

May 4, 2018
8777327

unix slash

May 4, 2018
ccfad34

download only if they not present

May 16, 2018
40f1574

Merge branch 'master' into ivanidze/switch_housing_dataset_to_wine

May 16, 2018
a49ed52

remove parenthesis

May 16, 2018
dc2be36

fix build

May 16, 2018
ee307bf

Replace Result to DestinationFile

May 16, 2018
0353bb7

move Url to subelement

May 18, 2018
7d76cd3

formatting

May 18, 2018
08a2a00

switch to sub-elements

May 22, 2018
45478c2

merge from master

May 22, 2018
f9bcb74

Update CrossValidationMacro

May 22, 2018
72abef1

create dataset

May 22, 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


2 changes: 2 additions & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,3 +328,5 @@ ASALocalRun/

# MSBuild Binary and Structured Log
*.binlog
# Ignore external test datasets.
/test/data/external/

18 changes: 16 additions & 2 deletions
build.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
 <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />

 <Import Project="$(ToolsDir)VersionTools.targets" Condition="Exists('$(ToolsDir)VersionTools.targets')" />

 <UsingTask TaskName="DownloadFilesFromUrl" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll"/>
 <PropertyGroup>
 <!-- To disable the restoration of packages, set RestoreDuringBuild=false or pass /p:RestoreDuringBuild=false.-->
 <RestoreDuringBuild Condition="'$(RestoreDuringBuild)'==''">true</RestoreDuringBuild>
Expand All@@ -33,6 +33,7 @@
 RestoreProjects;
 BuildNative;
 $(TraversalBuildDependsOn);
 DownloadExternalTestFiles;
 RunTests;
 </TraversalBuildDependsOn>
 </PropertyGroup>
Expand All@@ -56,13 +57,26 @@
 <ItemGroup>
 <PkgProject Include="pkg\**\*.nupkgproj" />
 </ItemGroup>

 <MSBuild Projects="@(PkgProject)"
 Targets="Restore" />
 <MSBuild Projects="@(PkgProject)"
 Targets="Pack" />
 </Target>

 <ItemGroup>
 <TestFile Include="$(MSBuildThisFileDirectory)/test/data/external/winequality-white.csv"
 Url="https://archive.ics.uci.edu/ml/machine-learning-databases/wine-quality/winequality-white.csv"
 DestinationFile="$(MSBuildThisFileDirectory)test/data/external/winequality-white.csv" />
 </ItemGroup>

 <Target Name="DownloadExternalTestFiles" Inputs="@(TestFile)" Outputs="%(TestFile.DestinationFile)">
 <Message Importance="High" Text="Downloading external test files... %(TestFile.DestinationFile)" />
 <DownloadFilesFromUrl Items="@(TestFile)"
 DestinationDir="test/data/external"
 TreatErrorsAsWarnings="true"/>
 </Target>

 <Target Name="RunTests" Condition="'$(RunTests)'=='true'">
 <MSBuild Projects="test\run-tests.proj"
 Targets="RunTests" />
Expand Down

32 changes: 28 additions & 4 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs

View file


Open in desktop

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

using ML = Microsoft.ML;
using Microsoft.ML.Runtime;
using Microsoft.ML.Data;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.EntryPoints;
using Microsoft.ML.TestFramework;
Expand DownExpand Up@@ -269,10 +270,10 @@ public void TestCrossValidationBinaryMacro()
 }
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact]
 public void TestCrossValidationMacro()
 {
 var dataPath = GetDataPath(@"housing.txt");
 var dataPath = GetDataPath(TestDatasets.winequality.trainFilename);
 using (var env = new TlcEnvironment())
 {
 var subGraph = env.CreateExperiment();
Expand All@@ -295,7 +296,30 @@ public void TestCrossValidationMacro()
 var modelCombineOutput = subGraph.Add(modelCombine);

 var experiment = env.CreateExperiment();
 var importInput = new ML.Data.TextLoader(dataPath);
 var importInput = new ML.Data.TextLoader(dataPath)
 {
 Arguments = new TextLoaderArguments
 {
 Separator = new[] { ';' },
 HasHeader = true,
 Column = new[]
 {
 new TextLoaderColumn()
 {
 Name = "Label",
 Source = new [] { new TextLoaderRange(11) },
 Type = DataKind.Num
 },

 new TextLoaderColumn()
 {
 Name = "Features",
 Source = new [] { new TextLoaderRange(0,10) },
 Type = DataKind.Num
 }
 }
 }
 };
 var importOutput = experiment.Add(importInput);

 var crossValidate = new ML.Models.CrossValidator
Expand DownExpand Up@@ -324,7 +348,7 @@ public void TestCrossValidationMacro()
 Assert.True(b);
 double val = 0;
 getter(ref val);
 Assert.Equal(3.32, val, 1);
 Assert.Equal(0.58, val, 1);
 b = cursor.MoveNext();
 Assert.False(b);
 }
Expand Down

23 changes: 13 additions & 10 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -910,7 +910,7 @@ public void EntryPointTextToKeyToText()
 }

 private void RunTrainScoreEvaluate(string learner, string evaluator, string dataPath, string warningsPath, string overallMetricsPath,
 string instanceMetricsPath, string confusionMatrixPath = null)
 string instanceMetricsPath, string confusionMatrixPath = null, string loader = null)
 {
 string inputGraph = string.Format(@"
 {{
Expand All@@ -919,6 +919,7 @@ private void RunTrainScoreEvaluate(string learner, string evaluator, string data
 'Name': 'Data.CustomTextLoader',
 'Inputs': {{
 'InputFile': '$file'
 {8}
 }},
 'Outputs': {{
 'Data': '$AllData'
Expand DownExpand Up@@ -978,7 +979,8 @@ private void RunTrainScoreEvaluate(string learner, string evaluator, string data
 }}
 }}", learner, evaluator, EscapePath(dataPath), EscapePath(warningsPath), EscapePath(overallMetricsPath), EscapePath(instanceMetricsPath),
 confusionMatrixPath != null ? ", 'ConfusionMatrix': '$ConfusionMatrix'" : "",
 confusionMatrixPath != null ? string.Format(", 'ConfusionMatrix' : '{0}'", EscapePath(confusionMatrixPath)) : "");
 confusionMatrixPath != null ? string.Format(", 'ConfusionMatrix' : '{0}'", EscapePath(confusionMatrixPath)) : "",
 string.IsNullOrWhiteSpace(loader) ? "" : string.Format(",'CustomSchema': '{0}'", loader));

 var jsonPath = DeleteOutputPath("graph.json");
 File.WriteAllLines(jsonPath, new[] { inputGraph });
Expand DownExpand Up@@ -1036,15 +1038,16 @@ public void EntryPointEvaluateMultiClass()
 Assert.Equal(3, CountRows(loader));
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact]
 public void EntryPointEvaluateRegression()
 {
 var dataPath = GetDataPath("housing.txt");
 var dataPath = GetDataPath(TestDatasets.winequality.trainFilename);
 var warningsPath = DeleteOutputPath("warnings.idv");
 var overallMetricsPath = DeleteOutputPath("overall.idv");
 var instanceMetricsPath = DeleteOutputPath("instance.idv");

 RunTrainScoreEvaluate("Trainers.StochasticDualCoordinateAscentRegressor", "Models.RegressionEvaluator", dataPath, warningsPath, overallMetricsPath, instanceMetricsPath);
 RunTrainScoreEvaluate("Trainers.StochasticDualCoordinateAscentRegressor", "Models.RegressionEvaluator",
 dataPath, warningsPath, overallMetricsPath, instanceMetricsPath, loader: TestDatasets.winequality.loaderSettings);

 using (var loader = new BinaryLoader(Env, new BinaryLoader.Arguments(), warningsPath))
 Assert.Equal(0, CountRows(loader));
Expand All@@ -1053,7 +1056,7 @@ public void EntryPointEvaluateRegression()
 Assert.Equal(1, CountRows(loader));

 using (var loader = new BinaryLoader(Env, new BinaryLoader.Arguments(), instanceMetricsPath))
 Assert.Equal(104, CountRows(loader));
 Assert.Equal(975, CountRows(loader));
 }

 [Fact]
Expand All@@ -1068,10 +1071,10 @@ public void EntryPointSDCAMultiClass()
 TestEntryPointRoutine("iris.txt", "Trainers.StochasticDualCoordinateAscentClassifier");
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact()]
 public void EntryPointSDCARegression()
 {
 TestEntryPointRoutine("housing.txt", "Trainers.StochasticDualCoordinateAscentRegressor");
 TestEntryPointRoutine(TestDatasets.winequality.trainFilename, "Trainers.StochasticDualCoordinateAscentRegressor", loader: TestDatasets.winequality.loaderSettings);
 }

 [Fact]
Expand DownExpand Up@@ -1142,10 +1145,10 @@ public void EntryPointHogwildSGD()
 TestEntryPointRoutine("breast-cancer.txt", "Trainers.StochasticGradientDescentBinaryClassifier");
 }

 [Fact(Skip = "Missing data set. See https://github.com/dotnet/machinelearning/issues/3")]
 [Fact()]
 public void EntryPointPoissonRegression()
 {
 TestEntryPointRoutine("housing.txt", "Trainers.PoissonRegressor");
 TestEntryPointRoutine(TestDatasets.winequality.trainFilename, "Trainers.PoissonRegressor", loader: TestDatasets.winequality.loaderSettings);
 }

 [Fact]
Expand Down

8 changes: 8 additions & 0 deletions
test/Microsoft.ML.TestFramework/Datasets.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,6 +152,14 @@ public static class TestDatasets
 testFilename = "housing.txt"
 };

 public static TestDataset winequality = new TestDataset
 {
 name = "wine",
 trainFilename = "external/winequality-white.csv",
 testFilename = "external/winequality-white.csv",
 loaderSettings = "col=Label:R4:11 col=Features:R4:0-10 sep=; header+"
 };

 public static TestDataset msm = new TestDataset
 {
 // REVIEW: Why is the MSM train set smaller than the test set? Reverse these!
Expand Down

2 changes: 1 addition & 1 deletion
test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,6 @@

 <ItemGroup>
 <NativeAssemblyReference Include="CpuMathNative" />
<NativeAssemblyReference Include="FastTreeNative" />
<NativeAssemblyReference Include="FastTreeNative" />
 </ItemGroup>
</Project>