Merge pull request #14 from radumg/patch-12-learn-node-null

namespaces re-organisation & cleanup
radumg · Feb 26, 2018 · 0f5c21a · 0f5c21a
2 parents 396b9bf + 3122b44
commit 0f5c21a
Show file tree

Hide file tree

Showing 11 changed files with 132 additions and 197 deletions.
diff --git a/...MachineLearning/SimpleLinearRegression.cs → ...ynAI/Algorithms/SimpleLinearRegression.cs b/...MachineLearning/SimpleLinearRegression.cs → ...ynAI/Algorithms/SimpleLinearRegression.cs
@@ -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

diff --git a/src/DynAI/Machine/IAlgorithm.cs → src/DynAI/Interfaces/IAlgorithm.cs b/src/DynAI/Machine/IAlgorithm.cs → src/DynAI/Interfaces/IAlgorithm.cs
@@ -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

diff --git a/src/DynAI/Machine/IMachine.cs → src/DynAI/Interfaces/IMachine.cs b/src/DynAI/Machine/IMachine.cs → src/DynAI/Interfaces/IMachine.cs
@@ -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

diff --git a/src/DynAI/Machine/MachineBase.cs → src/DynAI/Machine/Machine.cs b/src/DynAI/Machine/MachineBase.cs → src/DynAI/Machine/Machine.cs
@@ -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.

diff --git a/src/DynAI/MachineLearning.cs b/src/DynAI/MachineLearning.cs
@@ -9,7 +9,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AI.MachineLearning
+namespace AI.Algorithms
 {
     #region Linear Regression
 

diff --git a/src/DynAI/MachineLearning.csproj b/src/DynAI/MachineLearning.csproj
@@ -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" />

diff --git a/src/DynAI/MachineLearning/Regression.cs b/src/DynAI/MachineLearning/Regression.cs
diff --git a/test/AI IO test - Simple Linear Regression.json b/test/AI IO test - Simple Linear Regression.json
@@ -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,