Skip to content

Commit 0e2f4f1

Browse files
mdabrosmdabros
authored
Code analysis: Add editorconfig and fix code according to rules (#150)
1 parent 582995b commit 0e2f4f1

File tree

490 files changed

+37013
-37134
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

490 files changed

+37013
-37134
lines changed

‎.editorconfig

Lines changed: 362 additions & 0 deletions
Large diffs are not rendered by default.

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ However, several optimization methods are available for hyperparameter tuning:
5555
License
5656
-------
5757

58-
SharpLearning is covered under the terms of the [MIT](LICENSE.md) license. You may therefore link to it and use it in both opensource and proprietary software projects.
58+
SharpLearning is covered under the terms of the [MIT](LICENSE) license. You may therefore link to it and use it in both opensource and proprietary software projects.
5959

6060
Documentation
6161
-------------

‎SharpLearning.sln

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ci", "ci", "{45CBAF1D-3116-
6464
EndProject
6565
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{D83436F7-2EE6-4D59-ACC3-355C973BCDAF}"
6666
ProjectSection(SolutionItems) = preProject
67+
.editorconfig = .editorconfig
6768
.gitattributes = .gitattributes
6869
.gitignore = .gitignore
6970
CONTRIBUTING.md = CONTRIBUTING.md
@@ -74,12 +75,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{D83436F7-2
7475
EndProject
7576
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2204FA16-973A-48CF-A9FD-94FA72424BA4}"
7677
ProjectSection(SolutionItems) = preProject
77-
Directory.Build.props = Directory.Build.props
78-
Directory.Build.targets = Directory.Build.targets
79-
OutputBuildProject.props = OutputBuildProject.props
80-
OutputBuildProps.props = OutputBuildProps.props
81-
OutputBuildTargets.props = OutputBuildTargets.props
82-
SourceLink.GitHub.props = SourceLink.GitHub.props
78+
src\Directory.Build.props = src\Directory.Build.props
79+
src\Directory.Build.targets = src\Directory.Build.targets
80+
src\OutputBuildProject.props = src\OutputBuildProject.props
81+
src\OutputBuildProps.props = src\OutputBuildProps.props
82+
src\OutputBuildTargets.props = src\OutputBuildTargets.props
83+
src\SourceLink.GitHub.props = src\SourceLink.GitHub.props
8384
EndProjectSection
8485
EndProject
8586
Global

‎src/Directory.Build.props

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,12 @@
2929

3030
<GenerateDocumentationFile>true</GenerateDocumentationFile>
3131

32-
<!--Disabled for now-->
33-
<!--<AnalysisLevel>latest</AnalysisLevel>
32+
<AnalysisLevel>latest</AnalysisLevel>
3433
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
3534
<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
3635
<EnableNETAnalyzers>true</EnableNETAnalyzers>
37-
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>-->
38-
<NoWarn>CS1591</NoWarn>
36+
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
37+
<NoWarn>CS1591;CS1668</NoWarn>
3938

4039
</PropertyGroup>
4140

‎src/SharpLearning.AdaBoost.Test/AssemblyInitializeCultureTest.cs

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@
22
using System.Threading;
33
using Microsoft.VisualStudio.TestTools.UnitTesting;
44

5-
namespace SharpLearning.AdaBoost.Test
5+
namespace SharpLearning.AdaBoost.Test;
6+
7+
[TestClass]
8+
public static class AssemblyInitializeCultureTest
69
{
7-
[TestClass]
8-
public class AssemblyInitializeCultureTest
10+
[AssemblyInitialize]
11+
public static void AssemblyInitializeCultureTest_InvariantCulture(TestContext c)
912
{
10-
[AssemblyInitialize]
11-
public static void AssemblyInitializeCultureTest_InvariantCulture(TestContext c)
12-
{
13-
CultureInfo culture = CultureInfo.InvariantCulture;
14-
CultureInfo.DefaultThreadCurrentCulture = culture;
15-
CultureInfo.DefaultThreadCurrentUICulture = culture;
16-
Thread.CurrentThread.CurrentCulture = culture;
17-
Thread.CurrentThread.CurrentUICulture = culture;
18-
}
13+
CultureInfo culture = CultureInfo.InvariantCulture;
14+
CultureInfo.DefaultThreadCurrentCulture = culture;
15+
CultureInfo.DefaultThreadCurrentUICulture = culture;
16+
Thread.CurrentThread.CurrentCulture = culture;
17+
Thread.CurrentThread.CurrentUICulture = culture;
1918
}
20-
}
19+
}

‎src/SharpLearning.AdaBoost.Test/DataSetUtilities.cs

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,28 @@
22
using SharpLearning.Containers.Matrices;
33
using SharpLearning.InputOutput.Csv;
44

5-
namespace SharpLearning.AdaBoost.Test
5+
namespace SharpLearning.AdaBoost.Test;
6+
7+
public static class DataSetUtilities
68
{
7-
public static class DataSetUtilities
9+
public static (F64Matrix observations, double[] targets) LoadAptitudeDataSet()
810
{
9-
public static (F64Matrix observations, double[] targets) LoadAptitudeDataSet()
10-
{
11-
var parser = new CsvParser(() => new StringReader(AptitudeData));
12-
var observations = parser.EnumerateRows(v => v != "Pass").ToF64Matrix();
13-
var targets = parser.EnumerateRows("Pass").ToF64Vector();
14-
return (observations, targets);
15-
}
11+
var parser = new CsvParser(() => new StringReader(AptitudeData));
12+
var observations = parser.EnumerateRows(v => v != "Pass").ToF64Matrix();
13+
var targets = parser.EnumerateRows("Pass").ToF64Vector();
14+
return (observations, targets);
15+
}
1616

17-
public static (F64Matrix observations, double[] targets) LoadGlassDataSet()
18-
{
19-
var parser = new CsvParser(() => new StringReader(GlassData));
20-
var observations = parser.EnumerateRows(v => v != "Target").ToF64Matrix();
21-
var targets = parser.EnumerateRows("Target").ToF64Vector();
22-
return (observations, targets);
23-
}
17+
public static (F64Matrix observations, double[] targets) LoadGlassDataSet()
18+
{
19+
var parser = new CsvParser(() => new StringReader(GlassData));
20+
var observations = parser.EnumerateRows(v => v != "Target").ToF64Matrix();
21+
var targets = parser.EnumerateRows("Target").ToF64Vector();
22+
return (observations, targets);
23+
}
2424

25-
public const string AptitudeData =
26-
@"AptitudeTestScore;PreviousExperience_month;Pass
25+
public const string AptitudeData =
26+
@"AptitudeTestScore;PreviousExperience_month;Pass
2727
5;6;0
2828
1;15;0
2929
1;12;0
@@ -51,7 +51,7 @@ public static (F64Matrix observations, double[] targets) LoadGlassDataSet()
5151
1;8;0
5252
5;12;0";
5353

54-
public const string GlassData =
54+
public const string GlassData =
5555
@"F1;F2;F3;F4;F5;F6;F7;F8;F10;Target
5656
1.52101;13.64;4.49;1.1;71.78;0.06;8.75;0;0;1
5757
1.51761;13.89;3.6;1.36;72.73;0.48;7.83;0;0;1
@@ -268,5 +268,4 @@ public static (F64Matrix observations, double[] targets) LoadGlassDataSet()
268268
1.51651;14.38;0;1.94;73.61;0;8.48;1.57;0;7
269269
1.51711;14.23;0;2.08;73.36;0;8.62;1.67;0;7";
270270

271-
}
272-
}
271+
}

‎src/SharpLearning.AdaBoost.Test/Learners/ClassificationAdaBoostLearnerTest.cs

Lines changed: 57 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -5,83 +5,82 @@
55
using SharpLearning.Containers.Extensions;
66
using SharpLearning.Metrics.Classification;
77

8-
namespace SharpLearning.AdaBoost.Test.Learners
8+
namespace SharpLearning.AdaBoost.Test.Learners;
9+
10+
[TestClass]
11+
public class ClassificationAdaBoostLearnerTest
912
{
10-
[TestClass]
11-
public class ClassificationAdaBoostLearnerTest
13+
[TestMethod]
14+
public void ClassificationAdaBoostLearner_Learn_AptitudeData()
1215
{
13-
[TestMethod]
14-
public void ClassificationAdaBoostLearner_Learn_AptitudeData()
15-
{
16-
var (observations, targets) = DataSetUtilities.LoadAptitudeDataSet();
16+
var (observations, targets) = DataSetUtilities.LoadAptitudeDataSet();
1717

18-
var sut = new ClassificationAdaBoostLearner(10);
19-
20-
var model = sut.Learn(observations, targets);
21-
var predictions = model.Predict(observations);
18+
var sut = new ClassificationAdaBoostLearner(10);
2219

23-
var evaluator = new TotalErrorClassificationMetric<double>();
24-
var actual = evaluator.Error(targets, predictions);
20+
var model = sut.Learn(observations, targets);
21+
var predictions = model.Predict(observations);
2522

26-
Assert.AreEqual(0.038461538461538464, actual);
27-
}
23+
var evaluator = new TotalErrorClassificationMetric<double>();
24+
var actual = evaluator.Error(targets, predictions);
2825

29-
[TestMethod]
30-
public void ClassificationAdaBoostLearner_Learn_Glass()
31-
{
32-
var (observations, targets) = DataSetUtilities.LoadGlassDataSet();
26+
Assert.AreEqual(0.038461538461538464, actual);
27+
}
3328

34-
var sut = new ClassificationAdaBoostLearner(10, 1, 5);
29+
[TestMethod]
30+
public void ClassificationAdaBoostLearner_Learn_Glass()
31+
{
32+
var (observations, targets) = DataSetUtilities.LoadGlassDataSet();
3533

36-
var model = sut.Learn(observations, targets);
37-
var predictions = model.Predict(observations);
34+
var sut = new ClassificationAdaBoostLearner(10, 1, 5);
3835

39-
var evaluator = new TotalErrorClassificationMetric<double>();
40-
var actual = evaluator.Error(targets, predictions);
36+
var model = sut.Learn(observations, targets);
37+
var predictions = model.Predict(observations);
4138

42-
Assert.AreEqual(0.0, actual);
43-
}
39+
var evaluator = new TotalErrorClassificationMetric<double>();
40+
var actual = evaluator.Error(targets, predictions);
4441

45-
[TestMethod]
46-
public void ClassificationAdaBoostLearner_Learn_AptitudeData_SequenceContainNoItemIssue_Solved()
47-
{
48-
var (observations, targets) = DataSetUtilities.LoadAptitudeDataSet();
49-
var indices = new int[] { 22, 6, 23, 12 };
42+
Assert.AreEqual(0.0, actual);
43+
}
5044

51-
var sut = new ClassificationAdaBoostLearner(10);
52-
53-
var model = sut.Learn(observations, targets, indices);
54-
var predictions = model.Predict(observations);
55-
var indexedPredictions = predictions.GetIndices(indices);
56-
var indexedTargets = targets.GetIndices(indices);
45+
[TestMethod]
46+
public void ClassificationAdaBoostLearner_Learn_AptitudeData_SequenceContainNoItemIssue_Solved()
47+
{
48+
var (observations, targets) = DataSetUtilities.LoadAptitudeDataSet();
49+
var indices = new int[] { 22, 6, 23, 12 };
5750

58-
var evaluator = new TotalErrorClassificationMetric<double>();
59-
var actual = evaluator.Error(indexedTargets, indexedPredictions);
51+
var sut = new ClassificationAdaBoostLearner(10);
6052

61-
Assert.AreEqual(0.0, actual);
62-
}
53+
var model = sut.Learn(observations, targets, indices);
54+
var predictions = model.Predict(observations);
55+
var indexedPredictions = predictions.GetIndices(indices);
56+
var indexedTargets = targets.GetIndices(indices);
6357

64-
[TestMethod]
65-
public void ClassificationAdaBoostLearner_Learn_Glass_Indexed()
66-
{
67-
var (observations, targets) = DataSetUtilities.LoadGlassDataSet();
58+
var evaluator = new TotalErrorClassificationMetric<double>();
59+
var actual = evaluator.Error(indexedTargets, indexedPredictions);
60+
61+
Assert.AreEqual(0.0, actual);
62+
}
63+
64+
[TestMethod]
65+
public void ClassificationAdaBoostLearner_Learn_Glass_Indexed()
66+
{
67+
var (observations, targets) = DataSetUtilities.LoadGlassDataSet();
6868

69-
var sut = new ClassificationAdaBoostLearner(10, 1, 5);
69+
var sut = new ClassificationAdaBoostLearner(10, 1, 5);
7070

71-
var indices = Enumerable.Range(0, targets.Length).ToArray();
72-
indices.Shuffle(new Random(42));
73-
indices = indices.Take((int)(targets.Length * 0.7))
74-
.ToArray();
71+
var indices = Enumerable.Range(0, targets.Length).ToArray();
72+
indices.Shuffle(new Random(42));
73+
indices = indices.Take((int)(targets.Length * 0.7))
74+
.ToArray();
7575

76-
var model = sut.Learn(observations, targets, indices);
77-
var predictions = model.Predict(observations);
78-
var indexedPredictions = predictions.GetIndices(indices);
79-
var indexedTargets = targets.GetIndices(indices);
76+
var model = sut.Learn(observations, targets, indices);
77+
var predictions = model.Predict(observations);
78+
var indexedPredictions = predictions.GetIndices(indices);
79+
var indexedTargets = targets.GetIndices(indices);
8080

81-
var evaluator = new TotalErrorClassificationMetric<double>();
82-
var actual = evaluator.Error(indexedTargets, indexedPredictions);
81+
var evaluator = new TotalErrorClassificationMetric<double>();
82+
var actual = evaluator.Error(indexedTargets, indexedPredictions);
8383

84-
Assert.AreEqual(0.0, actual);
85-
}
84+
Assert.AreEqual(0.0, actual);
8685
}
8786
}

0 commit comments

Comments
 (0)