Skip to content
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

Resyncing ward #63

Merged
merged 9 commits into from
Mar 7, 2024
Merged

Resyncing ward #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
96e3be8
Fixed Unit Tests on Quartiles to adjust for the 75% training size par…
DashBoardman Dec 1, 2023
00c697b
Bump xunit from 2.6.2 to 2.6.6 (#57)
dependabot[bot] Feb 4, 2024
e110c8f
Bump BenchmarkDotNet from 0.13.10 to 0.13.12 (#55)
dependabot[bot] Feb 4, 2024
a0fcc23
Bump xunit.runner.visualstudio from 2.5.4 to 2.5.6 (#53)
dependabot[bot] Feb 4, 2024
514ae25
Bugfixes (#58)
ooples Feb 5, 2024
58b39ce
Bump coverlet.collector from 6.0.0 to 6.0.1 (#62)
dependabot[bot] Mar 1, 2024
93a59fb
Bump xunit.runner.visualstudio from 2.5.6 to 2.5.7 (#61)
dependabot[bot] Mar 1, 2024
d000232
Bump xunit from 2.6.6 to 2.7.0 (#60)
dependabot[bot] Mar 1, 2024
a72ad11
Bump Microsoft.NET.Test.Sdk from 17.8.0 to 17.9.0 (#59)
dependabot[bot] Mar 1, 2024
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: 1 addition & 1 deletion AiDotNetBenchmarkTests/AiDotNetBenchmarkTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/OutlierRemoval/IQROutlierRemoval.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ internal override (double[][], double[][]) RemoveOutliers(double[][] rawInputs,

return (finalInputs, finalOutputs);
}
}
}
9 changes: 4 additions & 5 deletions src/Regression/MultipleRegression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,10 @@ public MultipleRegression(double[][] inputs, double[] outputs, MultipleRegressio
ValidationHelper.CheckForInvalidTrainingSizes(trainingSize, inputSize - trainingSize, Math.Min(2, inputs.Length), trainingPctSize);

// Perform the actual work necessary to create the prediction and metrics models
var (trainingInputs, trainingOutputs, oosInputs, oosOutputs) =
PrepareData(inputs, outputs, trainingSize, RegressionOptions.Normalization);
var (cleanedInputs, cleanedOutputs) =
RegressionOptions.OutlierRemoval?.RemoveOutliers(trainingInputs, trainingOutputs) ?? (trainingInputs, trainingOutputs);
Fit(cleanedInputs, cleanedOutputs);
var (cleanedInputs, cleanedOutputs) = RegressionOptions.OutlierRemoval?.RemoveOutliers(inputs, outputs) ?? (inputs, outputs);
var (normalizedInputs, normalizedOutputs, oosInputs, oosOutputs) =
PrepareData(cleanedInputs, cleanedOutputs, trainingSize, RegressionOptions.Normalization);
Fit(normalizedInputs, normalizedOutputs);
Predictions = Transform(oosInputs);
Metrics = new Metrics(Predictions, oosOutputs, inputs.Length, RegressionOptions.OutlierRemoval?.Quartile);
}
Expand Down
9 changes: 4 additions & 5 deletions src/Regression/MultivariateRegression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,10 @@ public MultivariateRegression(double[][] inputs, double[][] outputs, MultipleReg
ValidationHelper.CheckForInvalidTrainingSizes(trainingSize, inputSize - trainingSize, Math.Min(2, inputSize), trainingPctSize);

// Perform the actual work necessary to create the prediction and metrics models
var (trainingInputs, trainingOutputs, oosInputs, oosOutputs) =
PrepareData(inputs, outputs, trainingSize, RegressionOptions.Normalization);
var (cleanedInputs, cleanedOutputs) =
RegressionOptions.OutlierRemoval?.RemoveOutliers(trainingInputs, trainingOutputs) ?? (trainingInputs, trainingOutputs);
Fit(cleanedInputs, cleanedOutputs);
var (cleanedInputs, cleanedOutputs) = RegressionOptions.OutlierRemoval?.RemoveOutliers(inputs, outputs) ?? (inputs, outputs);
var (normalizedInputs, normalizedOutputs, oosInputs, oosOutputs) =
PrepareData(cleanedInputs, cleanedOutputs, trainingSize, RegressionOptions.Normalization);
Fit(normalizedInputs, normalizedOutputs);
Predictions = Transform(oosInputs);
Metrics = new Metrics(Predictions, oosOutputs, inputSize, RegressionOptions.OutlierRemoval?.Quartile);
}
Expand Down
9 changes: 4 additions & 5 deletions src/Regression/PolynomialRegression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,10 @@ public PolynomialRegression(double[] inputs, double[] outputs, int order, Multip
ValidationHelper.CheckForInvalidTrainingSizes(trainingSize, inputSize - trainingSize, Math.Min(2, inputSize), trainingPctSize);

// Perform the actual work necessary to create the prediction and metrics models
var (trainingInputs, trainingOutputs, oosInputs, oosOutputs) =
PrepareData(inputs, outputs, trainingSize, RegressionOptions.Normalization);
var (cleanedInputs, cleanedOutputs) =
RegressionOptions.OutlierRemoval?.RemoveOutliers(trainingInputs, trainingOutputs) ?? (trainingInputs, trainingOutputs);
Fit(cleanedInputs, cleanedOutputs);
var (cleanedInputs, cleanedOutputs) = RegressionOptions.OutlierRemoval?.RemoveOutliers(inputs, outputs) ?? (inputs, outputs);
var (normalizedInputs, normalizedOutputs, oosInputs, oosOutputs) =
PrepareData(cleanedInputs, cleanedOutputs, trainingSize, RegressionOptions.Normalization);
Fit(normalizedInputs, normalizedOutputs);
Predictions = Transform(oosInputs);
Metrics = new Metrics(Predictions, oosOutputs, inputSize, RegressionOptions.OutlierRemoval?.Quartile);
}
Expand Down
9 changes: 4 additions & 5 deletions src/Regression/SimpleRegression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,10 @@ public SimpleRegression(double[] inputs, double[] outputs, SimpleRegressionOptio
ValidationHelper.CheckForInvalidTrainingSizes(trainingSize, inputSize - trainingSize, Math.Min(2, inputSize), trainingPctSize);

// Perform the actual work necessary to create the prediction and metrics models
var (trainingInputs, trainingOutputs, oosInputs, oosOutputs) =
PrepareData(inputs, outputs, trainingSize, RegressionOptions.Normalization);
var (cleanedInputs, cleanedOutputs) =
RegressionOptions.OutlierRemoval?.RemoveOutliers(trainingInputs, trainingOutputs) ?? (trainingInputs, trainingOutputs);
Fit(cleanedInputs, cleanedOutputs);
var (cleanedInputs, cleanedOutputs) = RegressionOptions.OutlierRemoval?.RemoveOutliers(inputs, outputs) ?? (inputs, outputs);
var (normalizedInputs, normalizedOutputs, oosInputs, oosOutputs) =
PrepareData(cleanedInputs, cleanedOutputs, trainingSize, RegressionOptions.Normalization);
Fit(normalizedInputs, normalizedOutputs);
Predictions = Transform(oosInputs);
Metrics = new Metrics(Predictions, oosOutputs, inputs.Length, RegressionOptions.OutlierRemoval?.Quartile);
}
Expand Down
9 changes: 4 additions & 5 deletions src/Regression/WeightedRegression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,10 @@ public WeightedRegression(double[] inputs, double[] outputs, double[] weights, i
ValidationHelper.CheckForInvalidTrainingSizes(trainingSize, inputSize - trainingSize, Math.Min(2, inputs.Length), trainingPctSize);

// Perform the actual work necessary to create the prediction and metrics models
var (trainingInputs, trainingOutputs, oosInputs, oosOutputs) =
PrepareData(inputs, outputs, trainingSize, RegressionOptions.Normalization);
var (cleanedInputs, cleanedOutputs) =
RegressionOptions.OutlierRemoval?.RemoveOutliers(trainingInputs, trainingOutputs) ?? (trainingInputs, trainingOutputs);
Fit(cleanedInputs, cleanedOutputs);
var (cleanedInputs, cleanedOutputs) = RegressionOptions.OutlierRemoval?.RemoveOutliers(inputs, outputs) ?? (inputs, outputs);
var (normalizedInputs, normalizedOutputs, oosInputs, oosOutputs) =
PrepareData(cleanedInputs, cleanedOutputs, trainingSize, RegressionOptions.Normalization);
Fit(normalizedInputs, normalizedOutputs);
Predictions = Transform(oosInputs);
Metrics = new Metrics(Predictions, oosOutputs, inputs.Length, RegressionOptions.OutlierRemoval?.Quartile);
}
Expand Down
8 changes: 4 additions & 4 deletions tests/AiDotNetTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@

<ItemGroup>
<DotNetCliToolReference Include="JetBrains.dotCover.CommandLineTools" Version="2023.2.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageReference Include="xunit" Version="2.6.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PackageReference Include="coverlet.collector" Version="6.0.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
Loading
Loading