From aad00267235b809f6f9479ba269af9e380ba89f1 Mon Sep 17 00:00:00 2001
From: Nate <nate.m.zimmerman@gmail.com>
Date: Tue, 21 Mar 2017 21:39:37 -0500
Subject: [PATCH] Updating stuff

---
 Maths.js          |  31 +++++++++++-
 Matrixs/calc.js   |  63 ++++++++++++++++++++++++
 Matrixs/delete.js |  27 +++++++++++
 Plots/plots.js    |   4 +-
 Poly/poly.js      | 121 ++++++++++++++++++++++++++++++++++++++++++++++
 Poly/polyLib.js   |   0
 index.html        |  17 +++++++
 7 files changed, 259 insertions(+), 4 deletions(-)
 create mode 100644 Matrixs/calc.js
 create mode 100644 Poly/poly.js
 create mode 100644 Poly/polyLib.js
 create mode 100644 index.html

diff --git a/Maths.js b/Maths.js
index ca3eacb..a3f6547 100644
--- a/Maths.js
+++ b/Maths.js
@@ -422,6 +422,33 @@ function matrix_delete_column(A,colNum)
     return M; 
 }
 
+
+function matrixs_decimate(A,decNumber)
+{
+    var M = [];
+    var deci = (decNumber ==0) ? 1 : decNumber;
+
+    for(var i = 0; i <A.length; i++)
+    {
+        if(i % decNumber == 0)
+        {
+            M.push(A[i])
+        }
+    }
+    return M;
+}
+
+matrix.prototype.decimate = function(decNumber)
+{
+    var M = matrixs_decimate(this.value,decNumber);
+    return matrix.make(M);
+};
+
+matrix.decimate = function(A,decNumber)
+{
+    return matrix.make(A).decimate(decNumber);
+}
+
 //Add to parent class 
 matrix.prototype.deleteRow = function(rowNum)
 {
@@ -2688,7 +2715,7 @@ plotyLayout = {
 };
 
 
-var defaultScatterObj = {
+defaultScatterObj = {
     x :[],
     y :[],
     mode : 'markers',
@@ -2699,7 +2726,7 @@ var defaultScatterObj = {
     } 
 }
 
-var defaultLineObj = {
+defaultLineObj = {
     x :[],
     y :[],
     mode : 'lines',
diff --git a/Matrixs/calc.js b/Matrixs/calc.js
new file mode 100644
index 0000000..cc069d4
--- /dev/null
+++ b/Matrixs/calc.js
@@ -0,0 +1,63 @@
+/*
+MIT License (MIT)
+Copyright (c) 2016 Nathan Zimmerman
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/ 
+
+var matrix = require('./matrixs');
+
+//Numerical Derivative 
+function matrix_difference(A)
+{
+	var M = [];
+	for(var i = 1; i < A.length; i++)
+	{
+		M[i-1] = [];
+		M[i-1][0] = A[i][0] - A[i-1][0];
+	}
+	return M;
+}
+
+
+//Numerical Integral 
+function matrix_sum(A)
+{
+	var M = [];
+	for(var i = 1; i < A.length; i++)
+	{
+		M[i-1] = [];
+		M[i-1][0] = A[i][0] + A[i-1][0];
+	}
+	return M;
+}
+
+
+//Add to parent class 
+matrix.prototype.differences = function()
+{
+    var M = matrix_difference(this.value);
+    return matrix.make(M);
+};
+
+//Add to parent class 
+matrix.differences = function(A)
+{
+    return matrix.make(A).differences();
+}
+
+
+//Add to parent class 
+matrix.prototype.sums = function()
+{
+    var M = matrix_sum(this.value,lb,ub);
+    return matrix.make(M);
+};
+
+
+//Add to parent class 
+matrix.sums = function(A)
+{
+    return matrix.make(A).sums();
+}
\ No newline at end of file
diff --git a/Matrixs/delete.js b/Matrixs/delete.js
index 458a66a..537f895 100644
--- a/Matrixs/delete.js
+++ b/Matrixs/delete.js
@@ -48,6 +48,33 @@ function matrix_delete_column(A,colNum)
     return M; 
 }
 
+
+function matrixs_decimate(A,decNumber)
+{
+    var M = [];
+    var deci = (decNumber ==0) ? 1 : decNumber;
+
+    for(var i = 0; i <A.length; i++)
+    {
+        if(i % decNumber == 0)
+        {
+            M.push(A[i])
+        }
+    }
+    return M;
+}
+
+matrix.prototype.decimate = function(decNumber)
+{
+    var M = matrixs_decimate(this.value,decNumber);
+    return matrix.make(M);
+};
+
+matrix.decimate = function(A,decNumber)
+{
+    return matrix.make(A).decimate(decNumber);
+}
+
 //Add to parent class 
 matrix.prototype.deleteRow = function(rowNum)
 {
diff --git a/Plots/plots.js b/Plots/plots.js
index 231986c..8d3dd66 100644
--- a/Plots/plots.js
+++ b/Plots/plots.js
@@ -48,7 +48,7 @@ plotyLayout = {
 };
 
 
-var defaultScatterObj = {
+defaultScatterObj = {
     x :[],
     y :[],
     mode : 'markers',
@@ -59,7 +59,7 @@ var defaultScatterObj = {
     } 
 }
 
-var defaultLineObj = {
+defaultLineObj = {
     x :[],
     y :[],
     mode : 'lines',
diff --git a/Poly/poly.js b/Poly/poly.js
new file mode 100644
index 0000000..916c9eb
--- /dev/null
+++ b/Poly/poly.js
@@ -0,0 +1,121 @@
+
+Matrixs = require('./matrixs');
+
+PolyLib = require('./poly');
+
+
+function polyMultiply(polyOne,polyTwo)
+{
+	var polyOneOrder = polyOne.length -1;
+	var polyTwoOrder = polyTwo.length -1;
+	var maxPolyOrder = polyTwoOrder + polyOneOrder; 
+
+	var M = Matrixs.zeros(1,maxPolyOrder+1);
+	var temp =  Matrixs.zeros(1,maxPolyOrder+1);
+
+	for(var i = 0; i < polyOne.length; i++)
+	{
+		for(var j = 0; j < polyTwo.length; j++)
+		{
+			temp.value[0][j+i] = polyOne[i]*polyTwo[j]
+		}
+		M = M.add(temp);
+		temp = temp.multiply(0);
+	}
+	return M.flatten();
+}
+
+
+function polyAdd(polyOne,polyTwo)
+{
+    var poly1 = Matrixs.make(polyOne).flatten();
+    var poly2 = Matrixs.make(polyTwo).flatten();
+	var polyOneOrder = poly1.length;
+	var polyTwoOrder = poly2.length;
+	var maxPolyOrder = Math.max(polyOneOrder,polyTwoOrder);
+    var M = Matrixs.zeros(1,maxPolyOrder).flatten();
+
+    for(var i = 0 ; i < polyOneOrder; i++)
+    {
+        M[i] += poly1[i];
+    }
+    for(var i = 0 ; i < polyTwoOrder; i++)
+    {
+        M[i] += poly2[i];
+    }
+	return M;
+}
+
+
+function polyPow(polyOne,powVal)
+{
+    var poly1 = Matrixs.make(polyOne).flatten();
+    var polyOneOrder = poly1.length;
+    var M = Matrixs.clone(poly1).flatten();
+    for(var i = 0; i < powVal - 1; i++)
+    {
+        M = polyMultiply(Matrixs.clone(M).flatten(),poly1)
+    }
+    return M;
+}
+
+
+function eulerDiffPoly(polyOne,timeStep)
+{
+    var poly1 = Matrixs.make(polyOne).flatten();
+    var polyOneOrder = poly1.length;
+    var M = [poly1[0]];
+    for(var i = 1; i < polyOneOrder; i++)
+    {
+        var temp = polyMultiply([-1,1],[timeStep]);
+        var power = polyPow(temp,i);
+        var final = polyMultiply(power,[poly1[i]]);
+        M = polyAdd(Matrixs.clone(M).flatten(),final);
+    }
+    console.log('wtf');
+    return M;
+}
+
+
+
+function tf(numerator,denominator,type,timeStep,obj)
+{
+    this.numerator = Matrixs.make(numerator).flatten();
+    this.numOrder = this.numerator.length;
+    this.denominator = Matrixs.make(denominator).flatten();
+    this.denOrder =  this.denominator.length;
+    
+    this.type = type;
+    this.timeStep = timeStep;
+    var icDefined = false; 
+    if(typeof(obj) !='undefined')
+    {
+       if((typeof(obj.numIc) !='undefined') && (typeof(obj.denIc) !='undefined') )
+       {
+            icDefined = true;
+            this.numIc = Matrixs.make(obj.numIc).flatten();
+            this.denIc = Matrixs.make(obj.denIc).flatten();
+       }
+    }
+    if(!icDefined)
+    {
+        this.numIc = Matrixs.zeros(this.numOrder).flatten();
+        this.denIc = Matrixs.zeros(this.denOrder).flatten();
+    }
+
+    console.log('new TF Made!');
+}
+
+function calculateTf(tf,value)
+{
+
+    return
+}
+
+
+
+
+
+
+PolyLib.poly
+
diff --git a/Poly/polyLib.js b/Poly/polyLib.js
new file mode 100644
index 0000000..e69de29
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..e2c1ea0
--- /dev/null
+++ b/index.html
@@ -0,0 +1,17 @@
+<html>
+
+<head>
+    
+</head>
+
+<body>
+<h1>Hello World!</h1>
+
+<div id='plotDiv' style='margin:auto; width:700px;height:400px;background-color:#DDD;'></div>
+
+</body>
+
+<script src='plotly.min.js'></script>
+<script src='Maths.js'></script>
+
+</html>
\ No newline at end of file