commit bc9586eb91989dce17200dfa9a740d2229d9e4a8
parent 2466b4325c0c284fff7f683cb63f0c5a3929c875
Author: therealFIGBERT <naomi@Naomis-MacBook-Air.local>
Date: Mon, 10 Jun 2019 15:02:55 -0700
Updating files
Diffstat:
7 files changed, 339 insertions(+), 149 deletions(-)
diff --git a/index.html b/index.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+
+<!-- Color pallete link:
+ BLUE: http://paletton.com/#uid=13U0u0k4U5c4xoI7bq3dFndhlk0
+ PURPLE: http://paletton.com/#uid=14H0u0k4U5c3wyY8GFFemvpl3of
+-->
+
+<head>
+ <title>FIGBERT Math</title>
+ <link rel="stylesheet" type="text/css" href="main.css">
+</head>
+<html>
+ <body>
+ <header>
+ <h1>FIGBERT Math</h1>
+ <h2>Custom Math Programs for Everyday Use</h2>
+ </header>
+ <div id="programs">
+ </div>
+ <footer>
+ <a href="about/" class="footer-text">About</a>
+ <div class="dot"></div>
+ <a href="requests/" class="footer-text">Request New Program</a>
+ <div class="dot"></div>
+ <a href="submit/" class="footer-text">Submit Code</a>
+ </footer>
+ </body>
+</html>
+
+<!--<form action="/matrix">
+ <input type="submit" value="Test">
+</form>-->
+\ No newline at end of file
diff --git a/main.css b/main.css
@@ -0,0 +1,55 @@
+* {
+ font-family: sans-serif, monospace;
+}
+
+body {
+ background-color: #1A181C;
+ margin: 0px;
+}
+
+header {
+ background-color: #643181;
+ text-align: center;
+ width: 100%;
+ position: fixed;
+ top: 0;
+}
+
+h1 {
+ margin: 0px;
+ padding: 10px 10px 0px 10px;
+ font-size: 30px;
+ color: #B494C7;
+ display: block;
+}
+
+header h2 {
+ color: #B494C7;
+ display: block;
+ margin: 0px;
+ padding-bottom: 10px;
+ font-size: 15px;
+}
+
+.footer-text {
+ color: #ACA0B2;
+ font-size: 10px;
+ margin: 10px;
+}
+
+.dot {
+ background-color: #ACA0B2;
+ width: 4px;
+ height: 4px;
+ border-radius: 50px;
+}
+
+footer {
+ display: flex;
+ flex-direction: row;
+ justify-content: flex-start;
+ align-items: center;
+ position: fixed;
+ bottom: 0;
+ width: 100%;
+}
+\ No newline at end of file
diff --git a/matrix/index.html b/matrix/index.html
@@ -1,67 +1,83 @@
<!DOCTYPE html>
-<head>
- <title>Matrix</title>
- <meta charset="utf-8">
- <link href="Matrix.css" rel="stylesheet">
-</head>
-<body>
- <header>
- <h1>Automatic Matrix Solver</h1>
- <h2>by FIGBERT</h2>
- </header>
- <main>
- <form>
- <fieldset>
- <legend>Pick the matrix format</legend>
- <label for="two"><input id="two" type="radio" name="eqSet" value="2">Two equations, two variables</label><br>
- <label for="three"><input id="three" type="radio" name="eqSet" value="3">Three equations, three variables</label><br>
- <label for="four"><input id="four" type="radio" name="eqSet" value="4">Four equations, four variables</label><br>
- <input type="button" value="Set" onclick="setUp(eqSet.value)">
- </fieldset>
- <fieldset id="equations">
- <legend>Pick the matrix values</legend>
- <div>
- <label for="wOne" class="w"><input id="wOne" type="number" name="setOne" class="numSet w a" step="0.01">w</label>
- <label for="xOne"><input id="xOne" type="number" name="setOne" class="numSet a" step="0.01">x</label>
- <label for="yOne"><input id="yOne" type="number" name="setOne" class="numSet a" step="0.01">y</label>
- <label for="zOne" class="z"><input id="zOne" type="number" name="setOne" class="numSet z a" step="0.01">z</label>
- <label for="equalsOne">=<input id="equalsOne" type="number" name="setOne" class="numSet a" step="0.01"></label>
- </div>
- <div>
- <label for="wTwo" class="w"><input id="wTwo" type="number" name="setTwo" class="numSet w a" step="0.01">w</label>
- <label for="xTwo"><input id="xTwo" type="number" name="setTwo" class="numSet a" step="0.01">x</label>
- <label for="yTwo"><input id="yTwo" type="number" name="setTwo" class="numSet a" step="0.01">y</label>
- <label for="zTwo" class="z"><input id="zTwo" type="number" name="setTwo" class="numSet z a" step="0.01">z</label>
- <label for="equalsTwo">=<input id="equalsTwo" type="number" name="setTwo" class="numSet a" step="0.01"></label>
- </div>
- <div id="thirdEquation">
- <label for="wThree" class="w"><input id="wThree" type="number" name="setThree" class="numSet w a" step="0.01">w</label>
- <label for="xThree"><input id="xThree" type="number" name="setThree" class="numSet a" step="0.01">x</label>
- <label for="yThree"><input id="yThree" type="number" name="setThree" class="numSet a" step="0.01">y</label>
- <label for="zThree" class="z"><input id="zThree" type="number" name="setThree" class="numSet z a" step="0.01">z</label>
- <label for="equalsThree">=<input id="equalsThree" type="number" name="setThree" class="numSet a" step="0.01"></label>
- </div>
- <div id="fourthEquation">
- <label for="wFour" class="w"><input id="wFour" type="number" name="setFour" class="numSet w a" step="0.01">w</label>
- <label for="xFour"><input id="xFour" type="number" name="setFour" class="numSet a" step="0.01">x</label>
- <label for="yFour"><input id="yFour" type="number" name="setFour" class="numSet a" step="0.01">y</label>
- <label for="zFour" class="z"><input id="zFour" type="number" name="setFour" class="numSet z a" step="0.01">z</label>
- <label for="equalsFour">=<input id="equalsFour" type="number" name="setFour" class="numSet a" step="0.01"></label>
- </div>
- <input type="button" value="Solve" onclick="solve(eqSet.value)">
- </fieldset>
- </form>
- <div id="out">
- <h3 id="titleOne">First Line:</h3>
- <p id="outOne"></p>
- <h3 id="titleTwo">Second Line:</h3>
- <p id="outTwo"></p>
- <h3 id="titleThree">Third Line:</h3>
- <p id="outThree"></p>
- <h3 id="titleFour">Fourth Line:</h3>
- <p id="outFour"></p>
- </div>
- </main>
- <script src="matrixBeta.js"></script>
-</body>
-\ No newline at end of file
+<html>
+ <head>
+ <title>Matrix</title>
+ <meta charset="utf-8">
+ <link href="matrix.css" rel="stylesheet">
+ </head>
+ <body>
+ <header>
+ <h1>Simultaneous Equation Solver</h1>
+ <h2>by FIGBERT</h2>
+ </header>
+ <main>
+ <form>
+ <fieldset>
+ <legend>Pick the equation format</legend>
+ <label for="two"><input id="two" type="radio" name="eqSet" value="2">Two equations, two variables</label><br>
+ <label for="three"><input id="three" type="radio" name="eqSet" value="3">Three equations, three variables</label><br>
+ <label for="four"><input id="four" type="radio" name="eqSet" value="4">Four equations, four variables</label><br>
+ <input type="button" value="Set" onclick="setUp(eqSet.value)">
+ </fieldset>
+ <fieldset id="equations">
+ <legend>Set the equation values</legend>
+ <div>
+ <label for="wOne" class="w"><input id="wOne" type="number" name="setOne" class="numSet w a" step="0.01">w</label>
+ <label for="xOne"><input id="xOne" type="number" name="setOne" class="numSet a" step="0.01">x</label>
+ <label for="yOne"><input id="yOne" type="number" name="setOne" class="numSet a" step="0.01">y</label>
+ <label for="zOne" class="z"><input id="zOne" type="number" name="setOne" class="numSet z a" step="0.01">z</label>
+ <label for="equalsOne">=<input id="equalsOne" type="number" name="setOne" class="numSet a" step="0.01"></label>
+ </div>
+ <div>
+ <label for="wTwo" class="w"><input id="wTwo" type="number" name="setTwo" class="numSet w a" step="0.01">w</label>
+ <label for="xTwo"><input id="xTwo" type="number" name="setTwo" class="numSet a" step="0.01">x</label>
+ <label for="yTwo"><input id="yTwo" type="number" name="setTwo" class="numSet a" step="0.01">y</label>
+ <label for="zTwo" class="z"><input id="zTwo" type="number" name="setTwo" class="numSet z a" step="0.01">z</label>
+ <label for="equalsTwo">=<input id="equalsTwo" type="number" name="setTwo" class="numSet a" step="0.01"></label>
+ </div>
+ <div id="thirdEquation">
+ <label for="wThree" class="w"><input id="wThree" type="number" name="setThree" class="numSet w a" step="0.01">w</label>
+ <label for="xThree"><input id="xThree" type="number" name="setThree" class="numSet a" step="0.01">x</label>
+ <label for="yThree"><input id="yThree" type="number" name="setThree" class="numSet a" step="0.01">y</label>
+ <label for="zThree" class="z"><input id="zThree" type="number" name="setThree" class="numSet z a" step="0.01">z</label>
+ <label for="equalsThree">=<input id="equalsThree" type="number" name="setThree" class="numSet a" step="0.01"></label>
+ </div>
+ <div id="fourthEquation">
+ <label for="wFour" class="w"><input id="wFour" type="number" name="setFour" class="numSet w a" step="0.01">w</label>
+ <label for="xFour"><input id="xFour" type="number" name="setFour" class="numSet a" step="0.01">x</label>
+ <label for="yFour"><input id="yFour" type="number" name="setFour" class="numSet a" step="0.01">y</label>
+ <label for="zFour" class="z"><input id="zFour" type="number" name="setFour" class="numSet z a" step="0.01">z</label>
+ <label for="equalsFour">=<input id="equalsFour" type="number" name="setFour" class="numSet a" step="0.01"></label>
+ </div>
+ <input type="button" value="Solve" onclick="solve(eqSet.value)">
+ </fieldset>
+ </form>
+ <div id="out">
+ <h3 id="titleOne">First Line:</h3>
+ <p id="outOne"></p>
+ <h3 id="titleTwo">Second Line:</h3>
+ <p id="outTwo"></p>
+ <h3 id="titleThree">Third Line:</h3>
+ <p id="outThree"></p>
+ <h3 id="titleFour">Fourth Line:</h3>
+ <p id="outFour"></p>
+ <h3 id="titleValues">Values:</h3>
+ <p id="wValue"></p>
+ <p id="xValue"></p>
+ <p id="yValue"></p>
+ <p id="zValue"></p>
+ </div>
+ </main>
+ <footer>
+ <a href="/index.html" class="footer-text">Home</a>
+ <div class="dot"></div>
+ <a href="about/" class="footer-text">About</a>
+ <div class="dot"></div>
+ <a href="requests/" class="footer-text">Request New Program</a>
+ <div class="dot"></div>
+ <a href="submit/" class="footer-text">Submit Code</a>
+ </footer>
+ </body>
+</html>
+<script src="matrixBeta.js"></script>
+\ No newline at end of file
diff --git a/matrix/matrix.css b/matrix/matrix.css
@@ -1,21 +1,36 @@
* {
font-family: sans-serif, monospace;
- font-weight: 300;
+ margin: 0px;
+}
+
+body {
+ background-color: #1A181C;
+}
+
+header {
+ background-color: #643181;
+ margin: 0px;
+ text-align: center;
+ width: 100%;
}
h1 {
- font-family: sans-serif, monospace;
- color: black;
- margin: 5px;
- font-weight: 600;
+ color: #B494C7;
+ font-size: 30px;
+ padding-bottom: 5px;
+ padding-top: 5px;
}
h2 {
- font-family: sans-serif, monospace;
- color: black;
- margin: 5px;
- font-weight: 100;
- margin-bottom: 10px;
+ color: #B494C7;
+ padding-bottom: 10px;
+ font-size: 15px;
+}
+
+main {
+ margin-top: 10px;
+ color: #ACA0B2;
+ border-color: #ACA0B2;
}
.numSet {
@@ -28,4 +43,33 @@ h2 {
#out {
display: none;
+}
+
+input {
+ background-color: #8E60A7;
+ border: 0px;
+ color: #ACA0B2;
+}
+
+.footer-text {
+ color: #ACA0B2;
+ font-size: 10px;
+ margin: 10px;
+}
+
+.dot {
+ background-color: #ACA0B2;
+ width: 4px;
+ height: 4px;
+ border-radius: 50px;
+}
+
+footer {
+ display: flex;
+ flex-direction: row;
+ justify-content: flex-start;
+ align-items: center;
+ position: fixed;
+ bottom: 0;
+ width: 100%;
}
\ No newline at end of file
diff --git a/matrix/matrix.js b/matrix/matrix.js
@@ -75,41 +75,60 @@ function setUp(num) {
}
}
-//THE PROBLEM WITH SOLVETHREE() IS HERE
+//answerTwo() accepts two simplified equations as input and outputs the x and y value
+function answerTwo(one, two) {
+ var
+ y = two[2] / two[1],
+ x = (one[2] - (one[1] * y)) / one[0];
+ return [x, y];
+}
+
//solveTwo() accepts the first two equations as input and solves the second
function solveTwo(one, two, dimension) {
"use strict";
- var
- multOne = lcm(one[0], two[0]) / one[0],
- multTwo = lcm(one[0], two[0]) / two[0],
- changingOne = [one[0], one[1], one[2]];
- if (dimension == 3) {
- changingOne.push(one[3]);
- } else if (dimension == 4) {
- changingOne.push(one[3], one[4]);
- }
- for (var a = 0; a < two.length; a++) {
- changingOne[a] = changingOne[a] * multOne;
- two[a] = two[a] * multTwo;
- }
- if (changingOne[0] + two[0] !== 0) {
- invert(changingOne);
- }
- for (var b = 0; b < two.length; b++) {
- two[b] = changingOne[b] + two[b];
+ if (dimension == 2){
+ var
+ multOneXY = lcm(one[0], two[0]) / one[0],
+ multTwoXY = lcm(one[0], two[0]) / two[0],
+ changingOneXY = [one[0], one[1], one[2]];
+ for (var a = 0; a < two.length; a++) {
+ changingOneXY[a] = changingOneXY[a] * multOneXY;
+ two[a] = two[a] * multTwoXY;
+ }
+ if (changingOneXY[0] + two[0] !== 0) {
+ invert(changingOneXY);
+ }
+ for (var b = 0; b < two.length; b++) {
+ two[b] = changingOneXY[b] + two[b];
+ }
+ return two;
+ } else if (dimension == 3) {
+ var
+ multOneXYZ = lcm(one[0], two[0]) / one[0],
+ multTwoXYZ = lcm(one[0], two[0]) / two[0],
+ changingOneXYZ = [one[0], one[1], one[2], one[3]];
+ for (var c = 0; c < two.length; c++) {
+ changingOneXYZ[c] = changingOneXYZ[c] * multOneXYZ;
+ two[c] = two[c] * multTwoXYZ;
+ }
+ if (changingOneXYZ[0] + two[0] !== 0) {
+ invert(changingOneXYZ);
+ }
+ for (var d = 0; d < two.length; d++) {
+ two[d] = changingOneXYZ[d] + two[d];
+ }
+ return two;
}
- return two;
}
//solveThree() accepts the first three equations as input and solves the second
-function solveThree(one, two, three) {
+function solveThree(one, two, three, dimension) {
"use strict";
var
multOne = lcm(one[0], three[0]) / one[0],
multThree = lcm(one[0], three[0]) / three[0],
changingOne = [one[0], one[1], one[2], one[3]],
- simpleTwo = solveTwo(one, two);
- console.log(multOne, multThree, changingOne, simpleTwo);
+ simpleTwo = solveTwo(one, two, dimension);
for (var a = 0; a < three.length; a++) {
changingOne[a] = changingOne[a] * multOne;
three[a] = three[a] * multThree;
@@ -143,16 +162,19 @@ function solve(dimension) {
var
firstXY = [parseInt(document.getElementById("xOne").value), parseInt(document.getElementById("yOne").value), parseInt(document.getElementById("equalsOne").value)],
secondXY = [parseInt(document.getElementById("xTwo").value), parseInt(document.getElementById("yTwo").value), parseInt(document.getElementById("equalsTwo").value)],
- answerXY = solveTwo(firstXY, secondXY, dimension);
+ answerXY = solveTwo(firstXY, secondXY, dimension),
+ valuesXY = answerTwo(firstXY, answerXY);
show([document.getElementById("out")]);
- hide([document.getElementById("titleThree"), document.getElementById("outThree"), document.getElementById("titleFour"), document.getElementById("outFour")]);
+ hide([document.getElementById("titleThree"), document.getElementById("outThree"), document.getElementById("titleFour"), document.getElementById("outFour"), document.getElementById("wValue"), document.getElementById("zValue")]);
document.getElementById("outOne").innerHTML = "[" + firstXY[0] + ", " + firstXY[1] + ", " + firstXY[2] + "]";
document.getElementById("outTwo").innerHTML = "[" + answerXY[0] + ", " + answerXY[1] + ", " + answerXY[2] + "]";
+ document.getElementById("xValue").innerHTML = "x = " + valuesXY[0];
+ document.getElementById("yValue").innerHTML = "y = " + valuesXY[1];
} else if (dimension == 3) {
var
firstXYZ = [parseInt(document.getElementById("xOne").value), parseInt(document.getElementById("yOne").value), parseInt(document.getElementById("zOne").value), parseInt(document.getElementById("equalsOne").value)],
secondXYZ = [parseInt(document.getElementById("xTwo").value), parseInt(document.getElementById("yTwo").value), parseInt(document.getElementById("zTwo").value), parseInt(document.getElementById("equalsTwo").value)],
thirdXYZ = [parseInt(document.getElementById("xThree").value), parseInt(document.getElementById("yThree").value), parseInt(document.getElementById("zThree").value), parseInt(document.getElementById("equalsThree").value)];
- console.log(solveThree(firstXYZ, secondXYZ, thirdXYZ));
+ console.log(solveThree(firstXYZ, secondXYZ, thirdXYZ, dimension));
}
}
\ No newline at end of file
diff --git a/matrix/matrixBeta.js b/matrix/matrixBeta.js
@@ -20,24 +20,24 @@ function invert(value) {
//hide() hides arrayed html elements using the "display: none" method and a for loop
function hide(elements) {
"use strict";
- for (var a = 0; a < elements.length; a++) {
- elements[a].style.display = "none";
+ for (var b = 0; b < elements.length; b++) {
+ elements[b].style.display = "none";
}
}
//reset() clears html number inputs by setting their value to null
function reset(elements) {
"use strict";
- for (var a = 0; a < elements.length; a++) {
- elements[a].value = null;
+ for (var c = 0; c < elements.length; c++) {
+ elements[c].value = null;
}
}
//show() shows arrayed html elements INLINE using a for loop
function show(elements) {
"use strict";
- for (var a = 0; a < elements.length; a++) {
- elements[a].style.display = "inline";
+ for (var d = 0; d < elements.length; d++) {
+ elements[d].style.display = "inline";
}
}
@@ -75,22 +75,39 @@ function setUp(num) {
}
}
-//THE PROBLEM WITH SOLVETHREE() IS HERE
-//solveTwo() accepts the first two equations as input and solves the second
+//answerTwo() accepts two simplified equations as input and outputs the x and y value
+function answerTwo(one, two) {
+ var
+ y = two[2] / two[1],
+ x = (one[2] - (one[1] * y)) / one[0];
+ return [x, y];
+}
+
+//answerThree() accepts three simplified equations as input and outputs the x, y, and z value
+function answerThree(one, two, three) {
+ var
+ z = three[3] / three[2],
+ y = (two[3] - (two[2] * z)) / two[1],
+ x = (one[3] - ((one[2] * z) + (one[1] * y))) / one[0];
+ return [x, y, z];
+}
+
+//solveTwo() accepts the two equations as input and simplifies the second
function solveTwo(one, two) {
"use strict";
var
multOne = lcm(one[0], two[0]) / one[0],
- multTwo = lcm(one[0], two[0]) / two[0];
- for (var a = 0; a < two.length; a++) {
- one[a] = one[a] * multOne;
- two[a] = two[a] * multTwo;
+ multTwo = lcm(one[0], two[0]) / two[0],
+ changingOne = one.slice();
+ for (var e = 0; e < two.length; e++) {
+ changingOne[e] = changingOne[e] * multOne;
+ two[e] = two[e] * multTwo;
}
- if (one[0] + two[0] !== 0) {
- invert(one);
+ if (changingOne[0] + two[0] !== 0) {
+ invert(changingOne);
}
- for (var b = 0; b < two.length; b++) {
- two[b] = one[b] + two[b];
+ for (var f = 0; f < two.length; f++) {
+ two[f] = changingOne[f] + two[f];
}
return two;
}
@@ -99,33 +116,22 @@ function solveTwo(one, two) {
function solveThree(one, two, three) {
"use strict";
var
- multOne = lcm(one[0], three[0]) / one[0],
- multThree = lcm(one[0], three[0]) / three[0],
- simpleTwo = solveTwo(one, two);
- for (var a = 0; a < three.length; a++) {
- one[a] = one[a] * multOne;
- three[a] = three[a] * multThree;
- }
- if (one[0] + three[0] !== 0) {
- invert(one);
- }
- for (var b = 0; b < three.length; b++) {
- three[b] = one[b] + three[b];
- }
- var
- multTwo = lcm(simpleTwo[1] + three[1]) / simpleTwo[1],
- subMultThree = lcm(simpleTwo[1] + three[1]) / three[1];
- for (var c = 0; c < three.length; c++) {
- simpleTwo[c] = simpleTwo[c] * multTwo;
- three[c] = three[c] * subMultThree;
- }
- if (simpleTwo[1] + three[1] !== 0) {
- invert(simpleTwo);
- }
- for (var d = 0; d < three.length; d++) {
- three[d] = three[d] + simpleTwo[d];
- }
- return three;
+ simpleTwo = solveTwo(one, two),
+ simpleThree = solveTwo(one, three),
+ multTwo = lcm(simpleTwo[1], simpleThree[1]) / simpleTwo[1],
+ multThree = lcm(simpleTwo[1], simpleThree[1]) / simpleThree[1],
+ changingTwo = simpleTwo.slice();
+ for (var g = 0; g < simpleThree.length; g++) {
+ changingTwo[g] = changingTwo[g] * multTwo;
+ simpleThree[g] = simpleThree[g] * multThree;
+ }
+ if (changingTwo[1] + simpleThree[1] !== 0) {
+ invert(changingTwo);
+ }
+ for (var h = 0; h < simpleThree.length; h++) {
+ simpleThree[h] = changingTwo[h] + simpleThree[h];
+ }
+ return [simpleTwo, simpleThree];
}
//solve() uses a combination of other functions to simplify the matrix
@@ -135,16 +141,29 @@ function solve(dimension) {
var
firstXY = [parseInt(document.getElementById("xOne").value), parseInt(document.getElementById("yOne").value), parseInt(document.getElementById("equalsOne").value)],
secondXY = [parseInt(document.getElementById("xTwo").value), parseInt(document.getElementById("yTwo").value), parseInt(document.getElementById("equalsTwo").value)],
- answerXY = solveTwo(firstXY, secondXY, dimension);
+ answerXY = solveTwo(firstXY, secondXY),
+ valuesXY = answerTwo(firstXY, answerXY);
show([document.getElementById("out")]);
- hide([document.getElementById("titleThree"), document.getElementById("outThree"), document.getElementById("titleFour"), document.getElementById("outFour")]);
+ hide([document.getElementById("titleThree"), document.getElementById("outThree"), document.getElementById("titleFour"), document.getElementById("outFour"), document.getElementById("wValue"), document.getElementById("zValue")]);
document.getElementById("outOne").innerHTML = "[" + firstXY[0] + ", " + firstXY[1] + ", " + firstXY[2] + "]";
document.getElementById("outTwo").innerHTML = "[" + answerXY[0] + ", " + answerXY[1] + ", " + answerXY[2] + "]";
+ document.getElementById("xValue").innerHTML = "x = " + valuesXY[0];
+ document.getElementById("yValue").innerHTML = "y = " + valuesXY[1];
} else if (dimension == 3) {
var
firstXYZ = [parseInt(document.getElementById("xOne").value), parseInt(document.getElementById("yOne").value), parseInt(document.getElementById("zOne").value), parseInt(document.getElementById("equalsOne").value)],
secondXYZ = [parseInt(document.getElementById("xTwo").value), parseInt(document.getElementById("yTwo").value), parseInt(document.getElementById("zTwo").value), parseInt(document.getElementById("equalsTwo").value)],
- thirdXYZ = [parseInt(document.getElementById("xThree").value), parseInt(document.getElementById("yThree").value), parseInt(document.getElementById("zThree").value), parseInt(document.getElementById("equalsThree").value)];
- console.log(solveThree(firstXYZ, secondXYZ, thirdXYZ));
+ thirdXYZ = [parseInt(document.getElementById("xThree").value), parseInt(document.getElementById("yThree").value), parseInt(document.getElementById("zThree").value), parseInt(document.getElementById("equalsThree").value)],
+ answerXYZ = solveThree(firstXYZ, secondXYZ, thirdXYZ),
+ valuesXYZ = answerThree(firstXYZ, answerXYZ[0], answerXYZ[1]);
+ show([document.getElementById("out"), document.getElementById("titleThree")]);
+ document.getElementById("outThree").style.display = "block";
+ hide([document.getElementById("titleFour"), document.getElementById("outFour"), document.getElementById("wValue")]);
+ document.getElementById("outOne").innerHTML = "[" + firstXYZ[0] + ", " + firstXYZ[1] + ", " + firstXYZ[2] + ", " + firstXYZ[3] + "]";
+ document.getElementById("outTwo").innerHTML = "[" + answerXYZ[0][0] + ", " + answerXYZ[0][1] + ", " + answerXYZ[0][2] + ", " + answerXYZ[0][3] + "]";
+ document.getElementById("outThree").innerHTML = "[" + answerXYZ[1][0] + ", " + answerXYZ[1][1] + ", " + answerXYZ[1][2] + ", " + answerXYZ[1][3] + "]";
+ document.getElementById("xValue").innerHTML = "x = " + valuesXYZ[0];
+ document.getElementById("yValue").innerHTML = "y = " + valuesXYZ[1];
+ document.getElementById("zValue").innerHTML = "z = " + valuesXYZ[2];
}
}
\ No newline at end of file
diff --git a/sources/hamburgerIcon.png b/sources/hamburgerIcon.png
Binary files differ.
