linny-r 1.6.4 → 1.6.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linny-r",
-  "version": "1.6.4",
+  "version": "1.6.6",
   "description": "Executable graphical language with WYSIWYG editor for MILP models",
   "main": "server.js",
   "scripts": {

package/static/scripts/linny-r-gui-actor-manager.js

@@ -305,14 +305,15 @@ class ActorManager {
       // Set its round flags
       a.round_flags = ali[2];
       // Double-check: parse expression if weight has been changed.
-      if(a.weight.text != ali[3]) {
-        xp.expr = monoSpacedVariables(ali[3]);
+      const awx = monoSpacedVariables(ali[3]);
+      if(a.weight.text != awx) {
+        xp.expr = awx;
         xp.compile();
         if(xp.error) {
           UI.warningInvalidWeightExpression(a, xp.error);
           ok = false;
         } else {
-          a.weight.update(ali[3]);
+          a.weight.update(xp);
         }
       }
       // Update import/export status

package/static/scripts/linny-r-gui-controller.js

@@ -549,9 +549,9 @@ class GUIController extends Controller {
     this.buttons.actors.addEventListener('click',
         () => ACTOR_MANAGER.showDialog());
     this.buttons.diagram.addEventListener('click',
-        () => FILE_MANAGER.renderDiagramAsPNG());
+        () => FILE_MANAGER.renderDiagramAsPNG(event.shiftKey));
     this.buttons.savediagram.addEventListener('click',
-        () => FILE_MANAGER.saveDiagramAsSVG());
+        () => FILE_MANAGER.saveDiagramAsSVG(event.shiftKey));
     this.buttons.receiver.addEventListener('click',
         () => RECEIVER.toggle());
     // NOTE: All draggable & resizable dialogs "toggle" show/hide.

package/static/scripts/linny-r-gui-experiment-manager.js

@@ -332,6 +332,9 @@ class GUIExperimentManager extends ExperimentManager {
       document.getElementById('xp-reset-btn').classList.add('off');
     }
     this.updateParameters();
+    // NOTE: When UpdateDialog is called after an entity has been renamed,
+    // its variable list should be updated.
+    this.updateViewerVariable();
   }
 
   updateParameters() {
@@ -515,6 +518,10 @@ class GUIExperimentManager extends ExperimentManager {
         addDistinct(vn, vl); 
       }
       vl.sort((a, b) => UI.compareFullNames(a, b));
+      // NOTE: When the selected variable entity has been renamed, its
+      // name will not be in the list (and its old name cannot be inferred)
+      // so then clear it.
+      if(vl.indexOf(x.selected_variable) < 0) x.selected_variable = '';
       for(let i = 0; i < vl.length; i++) {
         const vn = vl[i];
         // NOTE: FireFox selector dropdown areas have a pale gray

package/static/scripts/linny-r-gui-file-manager.js

@@ -342,11 +342,18 @@ class GUIFileManager {
         });
   }
 
-  renderDiagramAsPNG() {
+  renderDiagramAsPNG(tight) {
+    // When `tight` is TRUE, add no whitespace around the diagram.
     window.localStorage.removeItem('png-url');
-    UI.paper.fitToSize();
-    MODEL.alignToGrid();
-    this.renderSVGAsPNG(UI.paper.svg.outerHTML);
+    if(tight) {
+      // First align to grid and then fit to size.
+      MODEL.alignToGrid();      
+      UI.paper.fitToSize(1);
+    } else {
+      UI.paper.fitToSize();
+      MODEL.alignToGrid();      
+    }
+    this.renderSVGAsPNG(UI.paper.opaqueSVG);
   }
   
   renderSVGAsPNG(svg) {
@@ -374,10 +381,17 @@ class GUIFileManager {
       .catch((err) => UI.warn(UI.WARNING.NO_CONNECTION, err));
   }
   
-  saveDiagramAsSVG() {
-    UI.paper.fitToSize();
-    MODEL.alignToGrid();
-    this.pushOutSVG(UI.paper.outerHTML);
+  saveDiagramAsSVG(tight) {
+    // Output SVG as string with nodes and arrows 100% opaque.
+    if(tight) {
+      // First align to grid and then fit to size.
+      MODEL.alignToGrid();      
+      UI.paper.fitToSize(1);
+    } else {
+      UI.paper.fitToSize();
+      MODEL.alignToGrid();      
+    }
+    this.pushOutSVG(UI.paper.opaqueSVG);
   }
   
   pushOutSVG(svg) {

package/static/scripts/linny-r-gui-paper.js

@@ -132,7 +132,11 @@ class Shape {
       const ts = UI.paper.newSVGElement('tspan');
       ts.setAttribute('x', x);
       ts.setAttribute('dy', fh);
-      ts.textContent = lines[i];
+      // NOTE: Non-breaking space must now (inside a TSPAN) be converted
+      // to normal spaces, or they will be rendered as ' ' and this
+      // will cause the SVG to break when it is inserted as picture into
+      // an MS Word document.
+      ts.textContent = lines[i].replaceAll('\u00A0', ' ');
       el.appendChild(ts);
     }
     this.element.appendChild(el);
@@ -348,6 +352,13 @@ class Paper {
     this.clear();
   }
   
+  get opaqueSVG() {
+    // Return SVG as string with nodes and arrows 100% opaque.
+    // NOTE: The semi-transparent ovals behind rates on links have
+    // opacity 0.8 and hence are not affected.
+    return this.svg.outerHTML.replaceAll(' opacity="0.9"', ' opacity="1"');
+  }
+  
   clear() {
     // First, clear the entire SVG
     this.clearSVGElement(this.svg);
@@ -471,12 +482,12 @@ class Paper {
   }
   
   clearSVGElement(el) {
-    // Clears all sub-nodes of the specified SVG node
+    // Clear all sub-nodes of the specified SVG node.
     if(el) while(el.lastChild) el.removeChild(el.lastChild);
   }
   
   addSVGAttributes(el, obj) {
-    // Adds attributes specified by `obj` to (SVG) element `el`
+    // Add attributes specified by `obj` to (SVG) element `el`.
     for(let prop in obj) {
       if(obj.hasOwnProperty(prop)) el.setAttribute(prop, obj[prop]);
     }
@@ -686,35 +697,35 @@ class Paper {
     return el;
   }
 
-  fitToSize() {
+  fitToSize(margin=30) {
     // Adjust the dimensions of the main SVG to fit the graph plus 15px margin
     // all around
     this.removeInvisibleSVG();
     const
         bb = this.svg.getBBox(),
-        w = bb.width + 30,
-        h = bb.height + 30;
+        w = bb.width + margin,
+        h = bb.height + margin;
     if(w !== this.width || h !== this.height) {
-      MODEL.translateGraph(-bb.x + 15, -bb.y + 25);
+      MODEL.translateGraph(-bb.x + margin / 2, -bb.y + margin);
       this.width = w;
       this.height = h;
       this.svg.setAttribute('width', this.width);
       this.svg.setAttribute('height', this.height);
       this.zoom_factor = 1;
       this.zoom_label.innerHTML = Math.round(100 / this.zoom_factor) + '%';
-      this.extend();
+      this.extend(margin);
     }
   }
 
-  extend() {
+  extend(margin=30) {
     // Adjust the paper size to fit all objects WITHOUT changing the origin (0, 0)
     // NOTE: keep a minimum page size to keep the scrolling more "natural"
     this.removeInvisibleSVG();
     const
         bb = this.svg.getBBox(),
         // Let `w` and `h` be the actual width and height in pixels
-        w = bb.x + bb.width + 30,
-        h = bb.y + bb.height + 30,
+        w = bb.x + bb.width + margin,
+        h = bb.y + bb.height + margin,
         // Let `ccw` and `cch` be the size of the scrollable area
         ccw = w / this.zoom_factor,
         cch = h / this.zoom_factor;
@@ -1391,7 +1402,7 @@ class Paper {
           // Add 2px margin
           shift = 2;
       const lfd = (luc.actualDelay(MODEL.t));
-      if(lfd > 0) {
+      if(lfd != 0) {
         // If delay, draw it in a circle behind arrow head
         s = lfd;
         bb = this.numberSize(s, 7);
@@ -1419,6 +1430,7 @@ class Paper {
             {stroke:stroke_color, 'stroke-width': 0.5, fill: 'white'});
         // MU symbol does not center prettily => raise by 1 px
         const raise = (luc.multiplier === VM.LM_MEAN ||
+            luc.multiplier === VM.LM_STARTUP ||
             luc.multiplier === VM.LM_THROUGHPUT ? 1 :
                 (luc.multiplier === VM.LM_PEAK_INC ? 1.5 : 0));
         arrw.shape.addText(epx, epy - raise, VM.LM_SYMBOLS[luc.multiplier],
@@ -1462,12 +1474,13 @@ class Paper {
         epy = arrw.from_y + (shift + bi) * dy / l;
         font_color = this.palette.produced;
       }
-      // Draw the rate in a semi-transparent white ellipse
-      arrw.shape.addEllipse(epx, epy, tw/2, th/2, {fill: 'white', opacity: 0.8});
+      // Draw the rate in a semi-transparent white roundbox.
+      arrw.shape.addRect(epx, epy, tw, th,
+          {fill: 'white', opacity: 0.8, rx: 2, ry: 2});
       arrw.shape.addNumber(epx, epy, s, {fill: font_color, 'font-style': rrfs});
 
       // Draw the share of cost (only if relevant and > 0) behind the rate
-      // in a pale yellow filled box
+      // in a pale yellow filled box.
       if(MODEL.infer_cost_prices && luc.share_of_cost > 0) {
         // Keep the right distance from the rate: the midpoint should
         // increase by a varying length: number lengths / 2 when arrow is

package/static/scripts/linny-r-model.js

@@ -8437,8 +8437,8 @@ class Link {
     // Scales delay expression value to number of time steps on model
     // time scale
     let d = Math.floor(VM.SIG_DIF_FROM_ZERO + this.flow_delay.result(t));
-    // NOTE: negative values are interpreted as 0 (no warning)
-    if(d <= 0) return 0;
+    // NOTE: Negative values are permitted. This might invalidate cost
+    // price calculation -- to be checked!!
     return d;
   }
   

package/static/scripts/linny-r-vm.js

@@ -4295,7 +4295,7 @@ class VirtualMachine {
           cv = this.chunk_variables[ci - this.chunk_offset];
         }
         // NOTE: Do not scale the coefficient of the cash variable.
-        if(!cv[0].startsWith('C')) cc[ci] *= m;
+        if(cv && !cv[0].startsWith('C')) cc[ci] *= m;
       }
     }
   }