Variable Links are now Blue

Author: quffaro

packages/catlog/src/stdlib/models.rs

@@ -138,9 +138,8 @@ pub fn water_volume(th: Rc<UstrDiscreteTabTheory>) -> UstrDiscreteTabModel {
     model.add_mor(inflow, TabOb::Basic(source), TabOb::Basic(water), th.hom_type(ob_type.clone()));
     model.add_mor(flow, TabOb::Basic(water), TabOb::Basic(sediment), th.hom_type(ob_type));
     let spillover = ustr("SpilloverChecker");
-    let dynamible_type = TabObType::Basic(ustr("DynamicVariable"));
     // flow link
-    model.add_ob(spillover, dynamible_type.clone());
+    model.add_ob(spillover, TabObType::Basic(ustr("AuxiliaryVariable")));
     model.add_mor(
         ustr("dynVolume"),
         TabOb::Basic(spillover),

packages/catlog/src/stdlib/theories.rs

@@ -159,7 +159,7 @@ pub fn th_category_dynamic_stockflow() -> UstrDiscreteTabTheory {
         TabObType::Basic(x),
         th.tabulator(th.hom_type(TabObType::Basic(x))),
     );
-    let v = ustr("DynamicVariable");
+    let v = ustr("AuxiliaryVariable");
     th.add_ob_type(v);
     // there is a proarrow from the flow tabulator to the dynamic variable
     th.add_mor_type(

packages/frontend/src/stdlib/analyses/model_graph.tsx

@@ -108,7 +108,7 @@ export function modelToGraphviz(
     theory: Theory,
     attributes?: GV.GraphvizAttributes,
     nodeAttributes?: (jgmt: ModelJudgment) => Record<string, string> | undefined,
-	edgeAttributes?: (jgmt: ModelJudgment) => Record<string, string> | undefined,
+	// edgeAttributes?: (jgmt: ModelJudgment) => Record<string, string> | undefined,
 ): Viz.Graph {
     const nodes = new Map<string, Required<Viz.Graph>["nodes"][0]>();
     for (const judgment of model) {
@@ -163,12 +163,11 @@ export function modelToGraphviz(
                 fontname: GV.graphvizFontname(meta),
                 // Not recognized by Graphviz but will be passed through!
                 arrowstyle: meta?.arrowStyle ?? "default",
-				  ...(edgeAttributes?.(judgment).state.value ?? {
-					// label: judgment.name
-				})
+				  // ...(edgeAttributes?.(judgment).state.value ?? {
+					// // label: judgment.name
+				// })
             },
         });
-		console.log(edges);
     }
 
     return {

packages/frontend/src/stdlib/analyses/stock_flow_diagram.tsx

@@ -96,35 +96,34 @@ export function StockFlowGraphviz(props: {
 
     const vizLayout = () => {
         const viz = vizResource();
-		const patternAuxiliaryVariable: Pattern<ModelJudgment> = {
+		const patternAuxiliaryVariable: P.Pattern<ModelJudgment> = {
 		  tag: "object",
 		  obType: {
-			content: "DynamicVariable",
+			content: "AuxiliaryVariable",
 			tag: "Basic",
 		  }
 		};
-		const patternVariableLink: Pattern<ModelJudgment> = {
-			tag: "morphism",
-			morType: {
-			  content: "VariableLink",
-			  tag: "Basic",
-			}
-		};
+		// const patternVariableLink: P.Pattern<ModelJudgment> = {
+		// 	tag: "morphism",
+		// 	morType: {
+		// 	  content: "VariableLink",
+		// 	  tag: "Basic",
+		// 	}
+		// };
         return (
             viz &&
             vizLayoutGraph(
                 viz,
                 modelToGraphviz(props.model, props.theory, props.attributes, 
-					(jgmt: ModelJudgment) => { 
+					(jgmt: ModelJudgment) => 
 					  match(jgmt)
 					  .with(patternAuxiliaryVariable, () => ({ xlabel: jgmt.name, label: "" }))
 					  .with(P._, () => undefined)
-					},
-					(jgmt: ModelJudgment) =>  
-					  match(jgmt)
-					  .with(patternVariableLink, () => ({ style: "variable-link" }))
-					  .with(P._, () => undefined)
-					
+					  .run()
+					// (jgmt: ModelJudgment) =>  
+					//   match(jgmt)
+					//   .with(patternVariableLink, () => ({ style: "variable-link" }))
+					//   .with(P._, () => undefined)
 				),
                 props.options,
 			)
@@ -146,8 +145,24 @@ function StockFlowSVG(props: {
         const result: string[] = [];
         const nodeMap = uniqueIndexArray(props.layout?.nodes ?? [], (node) => node.id);
         const edgeMap = uniqueIndexArray(props.layout?.edges ?? [], (edge) => edge.id);
-		console.log(nodeMap, edgeMap);
-		const patternFlowLink: Pattern<ModelJudgment> = {
+		// const patternFlowLink: P.Pattern<ModelJudgment> = {
+		//   tag: "morphism",
+		//   dom: {
+		// 	tag: "Basic",
+		// 	content: P.select("srcId"),
+		//   },
+		//   cod: {
+		// 	tag: "Tabulated",
+		// 	content: {
+		// 	  tag: "Basic",
+		// 	  content: P.select("tgtId"),
+		// 	},
+		//   },
+		// };	
+        for (const judgment of props.model) {
+            match(judgment)
+				.with(
+				  {
 		  tag: "morphism",
 		  dom: {
 			tag: "Basic",
@@ -160,10 +175,7 @@ function StockFlowSVG(props: {
 			  content: P.select("tgtId"),
 			},
 		  },
-		};	
-        for (const judgment of props.model) {
-            match(judgment)
-				.with(patternFlowLink,
+		},
 					({ srcId, tgtId }) => {
                         const srcNode = nodeMap.get(srcId);
                         const tgtEdge = edgeMap.get(tgtId);

packages/frontend/src/stdlib/svg_styles.module.css.d.ts

@@ -2,5 +2,6 @@ declare const styles: {
     readonly box: string;
 	readonly circle: string;
 	readonly point: string;
+	readonly link: string;
 };
 export = styles;

packages/frontend/src/stdlib/theories.tsx

@@ -716,18 +716,18 @@ stdTheories.add(
                 },
                 {
                     tag: "ObType",
-                    obType: { tag: "Basic", content: "DynamicVariable" },
+                    obType: { tag: "Basic", content: "AuxiliaryVariable" },
                     name: "Variable",
-                    description: "Variable stuff",
-                    shortcut: ["V"],
+                    description: "A function of different stocks",
+                    shortcut: ["A"],
                     cssClasses: [styles.point],
                     svgClasses: [svgStyles.point],
                 },
                 {
                     tag: "MorType",
                     morType: { tag: "Basic", content: "FlowLink" },
                     name: "Flow Link",
-                    description: "Influence of a stock on a flow",
+                    description: "Influence of an auxiliary variable on a flow",
                     preferUnnamed: true,
                     shortcut: ["L"],
                 },
@@ -736,7 +736,7 @@ stdTheories.add(
                     morType: { tag: "Basic", content: "VariableLink" },
                     name: "Variable Link",
                     description: "Variable controlling stock quantity",
-                    shortcut: ["F"],
+                    shortcut: ["V"],
                     arrowStyle: "flat",
 					cssClasses: [styles.link],
                     svgClasses: [svgStyles.link],

packages/frontend/src/theory/types.ts

@@ -100,7 +100,6 @@ export class Theory {
 
     /** Get metadata for a morphism type as used in models. */
     modelMorTypeMeta(typ: MorType): ModelMorTypeMeta | undefined {
-	    console.log(this.modelTypeMeta.morTypeMeta(typ));
         return this.modelTypeMeta.morTypeMeta(typ);
     }
 
@@ -179,7 +178,6 @@ class TypeMetadata<ObMeta extends HasObTypeMeta, MorMeta extends HasMorTypeMeta>
     }
 
     morTypeMeta(typ: MorType): MorMeta | undefined {
-	    console.log("META: ", this.morTypeIndex.get(typ), this.types);
         const i = this.morTypeIndex.get(typ);
         return i !== undefined ? (this.types[i] as MorMeta) : undefined;
     }