started adding op amp

28raining · 28raining · commit 139d0ec8bf50 · 2023-01-12T21:53:27.000-08:00
diff --git a/filterAnalyzer/index.html b/filterAnalyzer/index.html
@@ -2,17 +2,13 @@
 <html lang="en">
 
 <head>
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.16.3/dist/katex.min.css" integrity="sha384-Juol1FqnotbkyZUT5Z7gUPjQ9gzlwCENvUZTpQBAPxtusdwFLRy382PSDx5UUJ4/" crossorigin="anonymous">
-
-  <!-- The loading of KaTeX is deferred to speed up page rendering -->
-  <script defer src="https://cdn.jsdelivr.net/npm/katex@0.16.3/dist/katex.min.js" integrity="sha384-97gW6UIJxnlKemYavrqDHSX3SiygeOwIZhwyOKRfSaf0JWKRVj9hLASHgFTzT+0O" crossorigin="anonymous"></script>
-
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Circuit Solver</title>
   <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css" rel="stylesheet"
     integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" crossorigin="anonymous">
-  <script src="https://cdn.plot.ly/plotly-2.14.0.min.js"></script>
+  <!-- <script src="https://cdn.plot.ly/plotly-2.14.0.min.js"></script> -->
+  <script src="js/plotly-2.14.0.min.js"></script>
   <script src="js/algebrite.bundle-for-browser-min.js"></script>
   <!-- <script src="js/algebrite_v1p2.bundle-for-browser-min.js"></script> -->
   <script src="js/startupSchematic.js"></script>
diff --git a/filterAnalyzer/js/plotly-2.14.0.min.js b/filterAnalyzer/js/plotly-2.14.0.min.js
diff --git a/filterAnalyzer/modules/View.js b/filterAnalyzer/modules/View.js
@@ -45,7 +45,7 @@ export class View extends draw2d.Canvas {
   }
 
   addShapeToSchem(type, x, y) {
-    console.log(type, x, y)
+    // console.log(type, x, y)
 
     var MyInputPortLocator = draw2d.layout.locator.PortLocator.extend({
       init:function(x,y){
diff --git a/filterAnalyzer/modules/main.js b/filterAnalyzer/modules/main.js
@@ -408,7 +408,7 @@ class Game extends React.Component {
 
   handleCanvasChange(canvasState) {
     // console.log("Inside handleCanvasChange");
-    // console.log(canvasState);
+    console.log(canvasState);
     var latexResult, deleteMeLatex;
     var newElementMap;
     var elements = this.state.elements;
@@ -417,7 +417,7 @@ class Game extends React.Component {
 
     //add new elements
     for (const key in newElementMap) {
-      if ((key == 'gnd') || (key == 'vout') || (key == 'vin')) continue;
+      if ((key == 'gnd') || (key == 'vout') || (key == 'vin') || (key == 'op')) continue;
       if (!(key in elements)) {
         var firstLetter = Array.from(key)[0];
         if (firstLetter == 'R') {
@@ -558,8 +558,8 @@ class Game extends React.Component {
     // Update the DOM
     return html`
       <${navBar} title="ONLINE ELECTRONIC CIRCUIT LAPLACE SOLVER" key="navBar"/>
-      <div className="w-100 p-3 bg-green">
-        <div className="container-xl">
+      <div className="w-100 p-3 bg-green" key="wrapper">
+        <div className="container-xl" key="topContainer">
           <${SchematicComponents} key="schemComp"/>
           <${Schematic} key="schem"/>
           <${SchematicVal} key="schemVal" schematicReadiness=${this.schematicReadiness}/>
diff --git a/filterAnalyzer/modules/mna.js b/filterAnalyzer/modules/mna.js
@@ -1,24 +1,41 @@
 import simplify_algebra from './simplify_algebra.js'
+
+function arrayContains (list1, item) {
+  return list1.findIndex((elem) => (elem.el == item.el) && (elem.port == item.port))
+}
+
+function includesElement (list1, item) {
+  return list1.findIndex((elem) => (elem.el == item))
+}
+
 function processCanvasState(canvasState) {
   var newElementMap = {};
   // var elementsOnNodes = [];
   var nodeMap = [];
   var createNode;
   var end1, end2, i, j, k;
   var optimized;
+  var idx;
+  var cnt;
+  var firstLetter;
 
 
   //Create a new node for each component
   canvasState.forEach(item => {
     if (item.type == "draw2d.Connection") {
       //get both ends of the connection
-      end1 = `${item.source.node}.${item.source.port}`
-      end2 = `${item.target.node}.${item.target.port}`
-      nodeMap.push([end1, end2])
+      // end1 = `${item.source.node}.${item.source.port}`
+      // end2 = `${item.target.node}.${item.target.port}`
+      nodeMap.push([{el: item.source.node, port: item.source.port}, {el: item.target.node, port: item.target.port}])
       // console.log(end1, end2);
     } else {
       //if its not a connection its an element
-      newElementMap[item.id] = {};
+      firstLetter = Array.from(item.id)[0];
+      //cnt is how many connections it's expected
+      if ((firstLetter=='L') || (firstLetter=='R') || (firstLetter=='C')) cnt = 2;
+      else if (firstLetter=='o') cnt = 3;
+      else cnt = 1;
+      newElementMap[item.id] = {cnt: cnt};
     }
   });
 
@@ -29,13 +46,17 @@ function processCanvasState(canvasState) {
       for (i = 0; i < nodeMap.length; i++) {
         for (j = 0; j < nodeMap[i].length; j++) {
           for (k = i+1; k < nodeMap.length; k++) {
-            if (nodeMap[k].includes(nodeMap[i][j])) {
+            // console.log('looking for ',nodeMap[i][j], ' inside ', nodeMap[k])
+            // if (nodeMap[k].includes(nodeMap[i][j])) {
+            idx = arrayContains(nodeMap[k], nodeMap[i][j])
+            if (idx >= 0) {
+              // console.log('common node')
               optimized = true;
               //Before concat with K, must remove the element that is about to be duplicated
-              const index = nodeMap[k].indexOf(nodeMap[i][j]);
-              if (index > -1) { // only splice array when item is found
-                nodeMap[k].splice(index, 1); // 2nd parameter means remove one item only
-              }
+              // const index = nodeMap[k].indexOf(nodeMap[i][j]);
+              // if (index > -1) { // only splice array when item is found
+                nodeMap[k].splice(idx, 1); // 2nd parameter means remove one item only
+              // }
               nodeMap[i] = nodeMap[i].concat(nodeMap[k]);
               nodeMap.splice(k, 1);
               break loop1;
@@ -45,50 +66,56 @@ function processCanvasState(canvasState) {
       }
   } while (optimized==true);
 
-  //     //check if either end exists in the nodemap, create a new entry or add to existing entry
-  //     createNode = true;
-  //     for (i = 0; i < nodeMap.length; i++) {
-  //       if (nodeMap[i].includes(end1) && !nodeMap[i].includes(end2)) {
-  //         nodeMap[i].push(end2);
-  //         createNode = false;
-  //         break;
-  //       }
-  //       else if (!nodeMap[i].includes(end1) && nodeMap[i].includes(end2)) {
-  //         nodeMap[i].push(end1);
-  //         createNode = false;
-  //         break;
-  //       }
-  //     }
-  //     if (createNode) {
-  //       nodeMap.push([end1, end2])
-  //     }
-  //     //Fixme - there needs to be some code here to merge nodes
-
-  //   } else {
-  //     //if its not a connection its an element
-  //     newElementMap[item.id] = {};
-  //   }
-
-  // });
-
-  var elementsOnNodes =[];
-  var t;
+  //loop thru nodemap and remove elements which don't have both ports connected
   for (i = 0; i < nodeMap.length; i++) {
-    elementsOnNodes[i] = [];
     for (j = 0; j < nodeMap[i].length; j++) {
-      t = nodeMap[i][j].split('.')
-      elementsOnNodes[i].push(t[0])
+      newElementMap[nodeMap[i][j].el].cnt -= 1;
     }
   }
+  for (const key in newElementMap) {
+    if(newElementMap[key].cnt > 0) {
+      console.log('removing', key)
+      //element must be removed!
+      for (i = 0; i < nodeMap.length; i++) {
+        for (j = 0; j < nodeMap[i].length; j++) {
+          do {
+            cnt = includesElement(nodeMap[i], key)
+            if (cnt>=0) nodeMap[i].splice(cnt,1)
+          } while (cnt >= 0)
+          // cnt = includesElement(nodeMap[i], key)
+          // newElementMap[nodeMap[i][j].el].cnt -= 1;
+        }
+      }
+      delete newElementMap[key]
+    }
+  }
+  console.log(newElementMap);
+
+  //remove 2-port and 3-port elements that aren't fully connected
+  //FIXME - here
+  //[x]1 - Change nodemap to an array of object. Kind of dumb to have to keep splitting
+  //[x]1a - remove elementsOnNodes
+  //[x]2 - create a counter array and count occurances of each element
+  //[x]3 - loop thru count array and remove anything which isn't 2 or 3
+
+  //list of elements on nodes, not specifying port
+  // var elementsOnNodes = [];
+  // var t;
+  // for (i = 0; i < nodeMap.length; i++) {
+  //   elementsOnNodes[i] = [];
+  //   for (j = 0; j < nodeMap[i].length; j++) {
+  //     t = nodeMap[i][j]['el']
+  //     elementsOnNodes[i].push(t)
+  //   }
+  // }
   // console.log('newElementMap', newElementMap)
 
-  return [elementsOnNodes, nodeMap, newElementMap]
+  return [nodeMap, newElementMap]
 
 }
 
 
 export function calculateMNA(canvasState, schematicReadiness) {
-  var elementsOnNodes = [];
   var nodeMap = [];
   var i, j;
   var vinNode, gndNode, voutNode;
@@ -97,8 +124,8 @@ export function calculateMNA(canvasState, schematicReadiness) {
   var element;
   var latexResult = null;
 
-  [elementsOnNodes, nodeMap, newElementMap] = processCanvasState(canvasState);
-  console.log("bp1",  elementsOnNodes, nodeMap, newElementMap)
+  [nodeMap, newElementMap] = processCanvasState(canvasState);
+  console.log("bp1", nodeMap, newElementMap)
 
   //verify how ready the schematic is
   // All this code is just for that! Can't it be done later, for free? //FIXME
@@ -109,29 +136,30 @@ export function calculateMNA(canvasState, schematicReadiness) {
     gnd: false,
   };
   var tmp;
-  for (i = 0; i < elementsOnNodes.length; i++) {
-    if (elementsOnNodes[i].includes('vout')) {
+  for (i = 0; i < nodeMap.length; i++) {
+    // if (elementsOnNodes[i].includes('vout')) {
+    if (includesElement(nodeMap[i], 'vout') >= 0) {
       schematicReadiness.vout = true;
       //See which nodes are connected together
       var crushedNodes = [i], zz, moreNodes, jj, kk, newNode, elementsOnThisNode = [];
       zz = i;
       moreNodes = [i];
-      elementsOnThisNode = [].concat(elementsOnThisNode + elementsOnNodes[i]);
+      elementsOnThisNode = [].concat(elementsOnThisNode + nodeMap[i]);
       while (moreNodes.length > 0) {
         moreNodes = [];
         newNode = moreNodes.pop();
         //Search through the node for elements with two ports (starting with the node tied to vout)
-        for (jj = 0; jj < elementsOnNodes[i].length; jj++) {
-          if (elementsOnNodes[i][jj] == 'vout') tmp = i;
-          else if (elementsOnNodes[i][jj] == 'vin') tmp = i;
-          else if (elementsOnNodes[i][jj] == 'gnd') tmp = i;
+        for (jj = 0; jj < nodeMap[i].length; jj++) {
+          if (nodeMap[i][jj].el == 'vout') tmp = i;
+          else if (nodeMap[i][jj].el == 'vin') tmp = i;
+          else if (nodeMap[i][jj].el == 'gnd') tmp = i;
           else {
             //found a two ported element. Add the node on the other end if it isn't already added.
-            for (kk = 0; kk < elementsOnNodes.length; kk++) {
+            for (kk = 0; kk < nodeMap.length; kk++) {
               if (!crushedNodes.includes(kk)) {
                 crushedNodes.push(kk);
                 moreNodes.push(kk);
-                elementsOnThisNode = [].concat(elementsOnThisNode, elementsOnNodes[kk]);
+                elementsOnThisNode = [].concat(elementsOnThisNode, nodeMap[kk]);
               }
             }
             moreNodes = 1;  //wtf does this line do!
@@ -140,8 +168,8 @@ export function calculateMNA(canvasState, schematicReadiness) {
       }
 
 
-      if (elementsOnThisNode.includes('gnd')) schematicReadiness.gnd = true;
-      if (elementsOnThisNode.includes('vin')) schematicReadiness.vin = true;
+      if (includesElement(elementsOnThisNode, 'gnd') >= 0) schematicReadiness.gnd = true;
+      if (includesElement(elementsOnThisNode, 'vin') >= 0) schematicReadiness.vin = true;
 
       break;
     }
@@ -157,22 +185,24 @@ export function calculateMNA(canvasState, schematicReadiness) {
 
   // Build MNA array
   if (schematicReadiness.vout && schematicReadiness.vin && schematicReadiness.gnd) {
+    var numOpAmps=0;
+    for(const key in newElementMap) if (Array.from(key)[0] == 'o') numOpAmps+=1;
     // Create 2D modified nodal analysis array
-    var mnaMatrix = new Array(nodeMap.length);
-    for (i = 0; i < nodeMap.length; i++) mnaMatrix[i] = new Array(nodeMap.length).fill("0");
+    var mnaMatrix = new Array(nodeMap.length + numOpAmps);
+    for (i = 0; i < mnaMatrix.length; i++) mnaMatrix[i] = new Array(mnaMatrix.length).fill("0");
     //create node map without gnd node. All nodes might need to shift
-    for (i = 0; i < elementsOnNodes.length; i++) {
-      if (elementsOnNodes[i].includes('gnd')) gndNode = i;
+    for (i = 0; i < nodeMap.length; i++) {
+      if (includesElement(nodeMap[i], 'gnd') >= 0) gndNode = i;
     }
     var nodeMapNoGnd = nodeMap;
-    var rem = nodeMapNoGnd.splice(gndNode, 1);
+    nodeMapNoGnd.splice(gndNode, 1);  //removes the ground node so MNA is arranged properly
 
     // Step 1 - create map of every element and which node it connects too. Doing this here, after node map is complete and ground node is removed
     for (i = 0; i < nodeMapNoGnd.length; i++) {
       for (j = 0; j < nodeMapNoGnd[i].length; j++) {
-        element = nodeMapNoGnd[i][j].split('.')
-        if (element[0] in elementMap) elementMap[element[0]].push(i)
-        else elementMap[element[0]] = [i]
+        element = nodeMapNoGnd[i][j]['el']
+        if (element in elementMap) elementMap[element].push(i)
+        else elementMap[element] = [i]
       }
     }
     voutNode = elementMap['vout'][0];
@@ -181,7 +211,7 @@ export function calculateMNA(canvasState, schematicReadiness) {
     // Step 2 - loop thru elementMap and start adding things to the MNA
     var laplaceElement, firstLetter;
     for (const key2 in elementMap) {
-      if ((key2 != 'vin') && (key2 != 'vout') && (key2 != 'gnd')) {
+      if ((key2 != 'vin') && (key2 != 'vout') && (key2 != 'gnd') && (key2 != 'op')) {
         firstLetter = Array.from(key2)[0];
         if (firstLetter == 'R') laplaceElement = key2;
         else if (firstLetter == 'L') laplaceElement = "(S*" + key2 + ")";
@@ -198,15 +228,28 @@ export function calculateMNA(canvasState, schematicReadiness) {
         }
       }
     }
-    //2.3 Add a 1 in the bottom column indicating which node is Vin connected too
-    mnaMatrix[mnaMatrix.length - 1][vinNode] = '1';
+    //2.3 Add a 1 in the bottom row indicating which node is Vin connected too
+    mnaMatrix[mnaMatrix.length - 1 - numOpAmps][vinNode] = '1';
 
     //2.4 Add a 1 in the node connected to Vin to indicate that Iin flows into that node
-    mnaMatrix[vinNode][mnaMatrix.length - 1] = '1';
+    mnaMatrix[vinNode][mnaMatrix.length - 1 - numOpAmps] = '1';
+
+    //2.5 For each op-amp add some 1's. It says that 2 nodes are equal to each other, and that 1 node has a new ideal current source
+    numOpAmps = 0;
+    for(const key in elementMap) {
+      if (Array.from(key)[0] == 'o') {
+        numOpAmps = numOpAmps + 1;
+        console.log("bp3",numOpAmps,key,elementMap[key] )
+        mnaMatrix[nodeMapNoGnd.length + numOpAmps][elementMap[key][0]] = '-1';
+        mnaMatrix[nodeMapNoGnd.length + numOpAmps][elementMap[key][1]] = '1';
+        mnaMatrix[elementMap[key][2]][nodeMapNoGnd.length + numOpAmps] = '1';
+      }
+    }
+
 
-    // console.log('elementMap', elementMap);
+    console.log('elementMap', elementMap);
     // console.log('vin, vout and gnd node', vinNode, voutNode, gndNode);
-    // console.log('mna ', mnaMatrix);
+    console.log('mna ', mnaMatrix);
 
     var nerdStrArr = [];
     var nerdStr = "";
diff --git a/filterAnalyzer/toDo.md b/filterAnalyzer/toDo.md
@@ -43,19 +43,25 @@
 - [x] add min-to-max frequency range
 - [x] Update when user changes value or unit
 - [x] Use units 
-- Add a hold button
 - [x] Add x-y cursors
-- Make graph background transparent
 - [x] Prevent user adding multiple Vin or Vout
 - [x] Stop it crashing when user drags multiple elements
 #### Remaining
+- [ ] Add a hold button
+- [ ] Make graph background transparent
 - [ ] Add color switcher in top bar
 - [ ] Separate page into those nice boxes each with shadow
 - [ ] Add comments section
 - [ ] Make draggable things into images, not text boxes
 - [ ] Add option to rotate components
-- [ ] displaying frequency response
-- [ ] Add an op-amp 
+- [x] displaying frequency response
+- [ ] Add an op-amp -> done a lot of this already
+- [ ] the element map has an array of port connections. That needs to go in a specific order, so later we know which op amp port is which
+- [ ] Move sanity checking into processCanvasState function, add all components fully connected?
+- [ ] processCanvasState() must also remove nodes that aren't connected to vout (it's already removing elements)
+- [ ] device can't connect to itself?
+- [ ] have a separate array just to hold op amps
+- [ ] Create object of elements, connect each end to a new node. Then delete elements who aren't fully connected, optimize the nodes, and remove nodes that don't have a path to vout
 
 
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ export class View extends draw2d.Canvas {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`addShapeToSchem(type, x, y) {`
`48`		`- console.log(type, x, y)`
	`48`	`+ // console.log(type, x, y)`
`49`	`49`
`50`	`50`	`var MyInputPortLocator = draw2d.layout.locator.PortLocator.extend({`
`51`	`51`	`init:function(x,y){`