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

namespaces re-organisation & cleanup #14

Merged
merged 2 commits into from
Feb 26, 2018
Merged

namespaces re-organisation & cleanup #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d545f71
namespaces re-organisation & cleanup
radumg Feb 26, 2018
3122b44
update samples
radumg Feb 26, 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
6 changes: 4 additions & 2 deletions ...MachineLearning/SimpleLinearRegression.cs → ...ynAI/Algorithms/SimpleLinearRegression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
using Accord.Math.Random;
using Accord.Statistics.Models.Regression.Linear;
using AI.Machine;
using Autodesk.DesignScript.Runtime;
using System;
using System.Collections.Generic;

namespace AI.MachineLearning.Regression
namespace AI.Algorithms.Regression
{
/// <summary>
/// In linear regression, the model specification is that the dependent variable, y is a linear combination of the parameters (but need not be linear in the independent variables).
/// </summary>
public class SimpleLinearRegression : IAlgorithm
{
#region Interface Properties
Expand Down
6 changes: 1 addition & 5 deletions src/DynAI/Machine/IAlgorithm.cs → src/DynAI/Interfaces/IAlgorithm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
using Autodesk.DesignScript.Runtime;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace AI.Machine
namespace AI
{
[IsVisibleInDynamoLibrary(false)]
public interface IAlgorithm
Expand Down
2 changes: 1 addition & 1 deletion src/DynAI/Machine/IMachine.cs → src/DynAI/Interfaces/IMachine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using Autodesk.DesignScript.Runtime;

namespace AI.Machine
namespace AI
{
/// <summary>
/// The generic capabilities of a machine, used for machine learning
Expand Down
3 changes: 1 addition & 2 deletions src/DynAI/Machine/MachineBase.cs → src/DynAI/Machine/Machine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using System;
using AI.Utilities;
using Autodesk.DesignScript.Runtime;
using AI.Machine;

namespace AI.Machine
namespace AI
{
/// <summary>
/// Machines are entities that can leverage different algorithms to learn from training data and then predict new values.
Expand Down
2 changes: 1 addition & 1 deletion src/DynAI/MachineLearning.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using System.Text;
using System.Threading.Tasks;

namespace AI.MachineLearning
namespace AI.Algorithms
{
#region Linear Regression

Expand Down
10 changes: 4 additions & 6 deletions src/DynAI/MachineLearning.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,10 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="MachineLearning\Regression.cs" />
<Compile Include="MachineLearning\SimpleLinearRegression.cs" />
<Compile Include="Machine\IAlgorithm.cs" />
<Compile Include="Machine\IMachine.cs" />
<Compile Include="Machine\MachineBase.cs" />
<Compile Include="Machine\RegressionMachine.cs" />
<Compile Include="Algorithms\SimpleLinearRegression.cs" />
<Compile Include="Interfaces\IAlgorithm.cs" />
<Compile Include="Interfaces\IMachine.cs" />
<Compile Include="Machine\Machine.cs" />
<Compile Include="Utils\JSON.cs" />
<Compile Include="MachineLearning.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
Expand Down
47 changes: 0 additions & 47 deletions src/DynAI/MachineLearning/Regression.cs
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions test/AI IO test - Simple Linear Regression.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"$type": "AI.Machine.Machine, AI",
"$type": "AI.Machine, AI",
"Name": "TestMachine #1",
"GUID": "4c5d8a58-2113-4a87-806d-90925f55618c",
"GUID": "70fe025a-c694-4350-9775-06b7ff30652e",
"Description": "simple machine",
"Algorithm": {
"$type": "AI.MachineLearning.Regression.SimpleLinearRegression, AI",
"$type": "AI.Algorithms.Regression.SimpleLinearRegression, AI",
"Name": "Simple Linear Regression",
"Type": 0,
"HasTrainingDataLoaded": true,
Expand Down
Loading