Merge Brendon -> Main

Author: bjpeters2027

.idea/.idea.BoGLWeb/.idea/.name

@@ -826,6 +826,20 @@
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
   </ItemGroup>
 
+  <PropertyGroup>
+      <Company>BoGLWeb</Company>
+      <Configuration>Debug</Configuration>
+      <FileVersion>1.0.0.0</FileVersion>
+      <InformationalVersion>1.0.0+6c6171249dfed73b6080245fb99863e333475c06</InformationalVersion>
+      <Product>BoGLWeb</Product>
+      <Title>BoGLWeb</Title>
+      <Version>1.0.0.0</Version>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+
   <ItemGroup>
     <ServiceWorker Include="wwwroot\service-worker.js" PublishedContent="wwwroot\service-worker.published.js" />
   </ItemGroup>

.idea/.idea.BoGLWeb/.idea/encodings.xml

@@ -2,6 +2,7 @@
 using BoGLWeb.EditorHelper;
 using GraphSynth.Representation;
 using Newtonsoft.Json;
+using System.Runtime.CompilerServices;
 using System.Runtime.ConstrainedExecution;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -14,14 +15,16 @@ public class BondGraph {
         protected Dictionary<string, Element> elements;
         [JsonProperty]
         protected List<Bond> bonds;
-
+        
         /// <summary>
         /// Creates an instance of BondGraph
         /// </summary>
         public BondGraph() {
+            
             this.elements = new Dictionary<string, Element>();
             this.bonds = new List<Bond>();
         }
+        
 
         /// <summary>
         /// Copies a separate object into this <c>BondGraph</c>.
@@ -124,8 +127,11 @@ public static BondGraph generateBondGraphFromGraphSynth(designGraph graph) {
                 throw new ArgumentException("Graph was null");
             }
 
-            BondGraph bondGraph = new();
+            Element.resetUni();
+            Bond.resetUni();
 
+            BondGraph bondGraph = new();
+            
             //Construct an Element for each node
             foreach(node node in graph.nodes) {
                 StringBuilder sb = new();
@@ -141,7 +147,7 @@ public static BondGraph generateBondGraphFromGraphSynth(designGraph graph) {
                         break;
                     }
                 }
-
+                
                 bondGraph.addElement(node.name, new Element(node.name, label, 0));
             }
 
@@ -170,6 +176,7 @@ public static BondGraph generateBondGraphFromGraphSynth(designGraph graph) {
                 }
             }
 
+           
             return bondGraph;
         }
 
@@ -261,7 +268,11 @@ public Element(string name, string label, double value) {
                 this.name = name;
                 this.label = label;
                 this.value = value;
-                AssignID(0, true);
+                bool dist = false;
+                if (name.Contains(":") || label.Contains("1") || label.Contains("0")) {
+                    dist = true;
+                }
+                AssignID(0, dist);
 
                 Random rnd = new();
                 this.x = rnd.Next(2000);
@@ -358,6 +369,10 @@ public override bool Equals(object? obj) {
                        this.name.Equals(element.name);
             }
 
+            public static void resetUni() {
+                universalID = 0;
+            }
+
             /// <summary>
             /// Creates a hash code for the element using the element's name
             /// </summary>
@@ -418,7 +433,7 @@ public class Bond {
             public string flowLabel = "f";
             [JsonProperty]
             public string effortLabel = "e";
-
+            
             //The arrow will always point at the sink
             /// <summary>
             /// Creates a Bond between two elements
@@ -444,7 +459,11 @@ public Bond(int sourceID, int targetID, Element source, Element sink, string lab
                 this.flow = flow;
                 this.effort = effort;
                 this.hasDirection = hasDirection;
-                AssignID(0, true);
+                this.ID = source.GetID();
+            }
+
+            public static void resetUni() {
+                universalID = 0;
             }
 
             /// <summary>

.idea/.idea.BoGLWeb/.idea/indexLayout.xml

@@ -13,7 +13,7 @@ public class BondGraphFactory {
         /// <exception cref="Exception">Thrown if the any generated BondGraphs are null</exception>
         public static (BondGraph, BondGraph, List<BondGraph>) generateBondGraphs(designGraph systemGraph) {
             BondGraphFactory factory = new(systemGraph);
-
+            
             //Check that we create all three bond graphs
             switch (factory.simplifiedBG) {
                 case null when factory.unsimplifiedBG is null:

.idea/.idea.BoGLWeb/.idea/projectSettingsUpdater.xml

@@ -51,7 +51,7 @@ export namespace backendManager {
 
             // makes BondGraphDisplay
             let bonds = JSON.parse(bg.bonds).map(b => {
-                return new BondGraphBond(b.ID, elements[b.sourceID], elements[b.targetID], b.causalStroke, b.causalStrokeDirection, !b.hasDirection && id != 0, b.effortLabel, b.flowLabel);
+                return new BondGraphBond(b.ID, elements[b.sourceID], elements[b.targetID], b.causalStroke, b.causalStrokeDirection, !b.hasDirection && id != 0, b.effortLabel, b.flowLabel, 0, elements[b.sourceID].label, elements[b.targetID].label, b.sourceID, b.targetID);
             }) as BondGraphBond[];
             let bondGraph = new BondGraphDisplay(id, svg, new BondGraph(elements, bonds));