linny-r 2.0.8 → 2.0.10

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

@@ -158,10 +158,8 @@ class ModelAutoSaver {
     document.getElementById('load-modal').style.display = 'none';
     // Contruct the table to select from.
     let html = '';
-    for(let i = 0; i < this.model_list.length; i++) {
-      const
-          m = this.model_list[i],
-          bytes = UI.sizeInBytes(m.size).split(' ');
+    for(const m of this.model_list) {
+      const bytes = UI.sizeInBytes(m.size).split(' ');
       html += ['<tr class="dataset" style="color: gray" ',
           'onclick="FILE_MANAGER.loadAutoSavedModel(\'',
           m.name,'\');"><td class="restore-name">', m.name, '</td><td>',

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

@@ -122,9 +122,7 @@ class GUIMonitor {
   addProgressBlock(b, err, time) {
     // Adds a block to the progress bar, and updates the relative block lengths
     let total_time = 0;
-    for(let i = 0; i < b; i++) {
-      total_time += VM.solver_times[i];
-    }
+    for(let i = 0; i < b; i++) total_time += VM.solver_times[i];
     const
         n = document.createElement('div'),
         ssecs = VM.solver_secs[b - 1];
@@ -158,15 +156,13 @@ class GUIMonitor {
   showBlock(b) {
     this.shown_block = b;
     const cn = this.progress_bar.childNodes;
-    for(let i = 0; i < cn.length; i++) {
-      cn[i].classList.remove('sel-pb');
-    }
+    for(const n of cn) n.classList.remove('sel-pb');
     cn[b - 1].classList.add('sel-pb');
     this.updateContent(this.tab);
   }
 
   updateDialog() {
-    // Implements default behavior for a draggable/resizable dialog
+    // Implements default behavior for a draggable/resizable dialog.
     this.updateContent(this.tab);
   }
   
@@ -199,33 +195,31 @@ class GUIMonitor {
   }
 
   showCallStack(t) {
-    // Show the error message in the dialog header
-    // NOTE: prevent showing again when VM detects multiple errors
+    // Show the error message in the dialog header.
+    // NOTE: Prevent showing again when VM detects multiple errors.
     if(this.call_stack_shown) return;
     const
         csl = VM.call_stack.length,
         top = VM.call_stack[csl - 1],
         err = top.vector[t],
-        // Make separate lists of variable names and their expressions
+        // Make separate lists of variable names and their expressions.
         vlist = [],
         xlist = [];
     document.getElementById('call-stack-error').innerHTML =
         `ERROR at t=${t}: ` + VM.errorMessage(err);
-    for(let i = 0; i < csl; i++) {
-      const
-          x = VM.call_stack[i],
-          // For equations, only show the attribute
-          ons = (x.object === MODEL.equations_dataset ? '' :
-              x.object.displayName + '|');
+    for(const x of VM.call_stack) {
+      // For equations, only show the attribute.
+      const ons = (x.object === MODEL.equations_dataset ? '' :
+          x.object.displayName + '|');
       vlist.push(ons + x.attribute);
-      // Trim spaces around all object-attribute separators in the expression
+      // Trim spaces around all object-attribute separators in the expression.
       xlist.push(x.text.replace(/\s*\|\s*/g, '|'));
     }
-    // Highlight variables where they are used in the expressions
+    // Highlight variables where they are used in the expressions.
     const vcc = UI.chart_colors.length;
     for(let i = 0; i < xlist.length; i++) {
       for(let j = 0; j < vlist.length; j++) {
-        // Ignore selectors, as these may be different per experiment
+        // Ignore selectors, as these may be different per experiment.
         const
             vnl = vlist[j].split('|'),
             sel = (vnl.length > 1 ? vnl.pop() : ''),
@@ -236,26 +230,26 @@ class GUIMonitor {
         xlist[i] = xlist[i].split(vn).join(vnc);
       }
     }
-    // Then also color the variables
+    // Then also color the variables.
     for(let i = 0; i < vlist.length; i++) {
       vlist[i] = '<span style="font-weight: 600; color: ' +
         `${UI.chart_colors[i % vcc]}">${vlist[i]}</span>`;
     }
-    // Start without indentation
+    // Start without indentation.
     let pad = 0;
-    // First show the variable being computed
+    // First show the variable being computed.
     const tbl = ['<div>', vlist[0], '</div>'];
-    // Then iterate upwards over the call stack
+    // Then iterate upwards over the call stack.
     for(let i = 0; i < vlist.length - 1; i++) {
-      // Show the expression, followed by the next computed variable
+      // Show the expression, followed by the next computed variable.
       tbl.push(['<div class="call-stack-row" style="padding-left: ',
         pad, 'px"><div class="call-stack-expr">', xlist[i],
-        '</div><div class="call-stack-vbl">&nbsp;\u2937', vlist[i+1],
+        '</div><div class="call-stack-vbl">&nbsp;\u2937', vlist[i + 1],
         '</div></div>'].join(''));
       // Increase indentation
       pad += 8;
     }
-    // Show the last expression, highlighting the array-out-of-bounds (if any)
+    // Show the last expression, highlighting the array-out-of-bounds (if any).
     let last_x = xlist[xlist.length - 1],
         anc = '';
     if(VM.out_of_bounds_array) {
@@ -265,14 +259,14 @@ class GUIMonitor {
     }
     tbl.push('<div class="call-stack-expr" style="padding-left: ' +
         `${pad}px">${last_x}</div>`);
-    // Add index-out-of-bounds message if appropriate
+    // Add index-out-of-bounds message if appropriate.
     if(anc) {
       tbl.push('<div style="color: gray; margin-top: 8px; font-size: 10px">',
           VM.out_of_bounds_msg.replace(VM.out_of_bounds_array, anc), '</div>');
     }
-    // Dump the code for the last expression to the console
+    // Dump the code for the last expression to the console.
     console.log('Code for', top.text, top.code);
-    // Show the call stack dialog
+    // Show the call stack dialog.
     document.getElementById('call-stack-table').innerHTML = tbl.join('');
     document.getElementById('call-stack-modal').style.display = 'block';
     this.call_stack_shown = true;    
@@ -284,19 +278,19 @@ class GUIMonitor {
   }
 
   logMessage(block, msg) {
-    // Appends a solver message to the monitor's messages textarea
+    // Append a solver message to the monitor's messages textarea
     if(this.messages_text.value === VM.no_messages) {
-      // Erase the "(no messages)" if still showing
+      // Erase the "(no messages)" if still showing.
       this.messages_text.value = '';
     }
     if(this.shown_block === 0 && block !== this.last_message_block) {
-      // Clear text area when starting with new block while no block selected
+      // Clear text area when starting with new block while no block selected.
       this.last_message_block = block;
       this.messages_text.value = '';      
     }
     // NOTE: `msg` is appended only if no block has been selected by
     // clicking on the progress bar, or if the message belongs to the
-    // selected block
+    // selected block.
     if(this.shown_block === 0 || this.shown_block === block) {
       this.messages_text.value += msg + '\n';
     }
@@ -347,8 +341,8 @@ class GUIMonitor {
   }
 
   connectToServer() {
-    // Prompts for credentials if not connected yet.
-    // NOTE: No authentication prompt if SOLVER.user_id in `linny-r-config.js`
+    // Prompt for credentials if not connected yet.
+    // NOTE: No authentication prompt if SOLVER.user_id in `linny-r-config.js`.
     // is left blank.
     if(!VM.solver_user) {
       VM.connected = false;
@@ -414,7 +408,7 @@ UI.logHeapSize(`BEFORE creating post data`);
             mipgap: MODEL.MIP_gap
           });
 UI.logHeapSize(`AFTER creating post data`);
-    // Immediately free the memory taken up by VM.lines
+    // Immediately free the memory taken up by VM.lines.
     VM.lines = '';
     UI.logHeapSize(`BEFORE submitting block #${bwr} to solver`);
     fetch('solver/', pd)
@@ -430,15 +424,15 @@ UI.logHeapSize(`AFTER creating post data`);
           try {
             VM.processServerResponse(JSON.parse(data));
             UI.logHeapSize('After processing results for block #' + this.block_count);
-            // If no errors, solve next block (if any)
-            // NOTE: use setTimeout so that this calling function returns,
-            // and browser can update its DOM to display progress
+            // If no errors, solve next block (if any).
+            // NOTE: Use setTimeout so that this calling function returns,
+            // and browser can update its DOM to display progress.
             setTimeout(() => VM.solveBlocks(), 1);
           } catch(err) {
-            // Log details on the console
+            // Log details on the console.
             console.log('ERROR while parsing JSON:', err);
             console.log(data);
-            // Pass summary on to the browser
+            // Pass summary on to the browser.
             const msg = 'ERROR: Unexpected data from server: ' +
                 ellipsedText(data);
             this.logMessage(this.block_count, msg);

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

@@ -128,7 +128,7 @@ class Shape {
     el.setAttribute('x', x);
     el.setAttribute('y', cy);
     UI.paper.addSVGAttributes(el, attrs);
-    for(let i = 0; i < lines.length; i++) {
+    for(const l of lines) {
       const ts = UI.paper.newSVGElement('tspan');
       ts.setAttribute('x', x);
       ts.setAttribute('dy', fh);
@@ -136,7 +136,7 @@ class Shape {
       // to normal spaces, or they will be rendered as '&nbsp;' 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', ' ');
+      ts.textContent = l.replaceAll('\u00A0', ' ');
       el.appendChild(ts);
     }
     this.element.appendChild(el);
@@ -614,42 +614,42 @@ class Paper {
         fw = fh / 2;
     let w = 0, m = 0;
     // Approximate the width of the Unicode characters representing
-    // special values
+    // special values.
     if(ns === '\u2047') {
       w = 8; // undefined (??)
     } else if(ns === '\u25A6' || ns === '\u2BBF' || ns === '\u26A0') {
       w = 6; // computing, not computed, warning sign
     } else {
       // Assume that number has been rendered with fixed spacing
-      // (cf. addNumber method of class Shape)
+      // (cf. addNumber method of class Shape).
       w = ns.length * fw;
-      // Decimal point and minus sign are narrower
+      // Decimal point and minus sign are narrower.
       if(ns.indexOf('.') >= 0) w -= 0.6 * fw;
       if(ns.startsWith('-')) w -= 0.55 * fw;
-      // Add approximate extra length for =, % and special Unicode characters
+      // Add approximate extra length for =, % and special Unicode characters.
       if(ns.indexOf('=') >= 0) {
         w += 0.2 * fw;
       } else {
-        // LE, GE, undefined (??), or INF are a bit wider
+        // LE, GE, undefined (??), or INF are a bit wider.
         m = ns.match(/%|\u2264|\u2265|\u2047|\u221E/g);
         if(m) {
           w += m.length * 0.25 * fw;
         }
-        // Ellipsis (may occur between process bounds) is much wider
+        // Ellipsis (may occur between process bounds) is much wider.
         m = ns.match(/\u2026/g);
         if(m) w += m.length * 0.6 * fw;
       }
     }
-    // adjust for font weight
+    // Adjust for font weight.
     return {width: w * this.weight_factors[Math.round(fweight / 100)],
         height: fh};
   }
   
   textSize(string, fsize=8, fweight=400) {
-    // Returns the boundingbox {width: ..., height: ...} of a string (in pixels) 
-    // NOTE: uses the invisible SVG element that is defined specifically
-    // for text size computation
-    // NOTE: text size calculation tends to slightly underestimate the
+    // Return the boundingbox {width: ..., height: ...} of a string (in pixels). 
+    // NOTE: Uses the invisible SVG element that is defined specifically
+    // for text size computation.
+    // NOTE: Text size calculation tends to slightly underestimate the
     // length of the string as it is actually rendered, as font sizes
     // appear to be rounded to the nearest available size.
     const el = this.getSizingElement();
@@ -659,12 +659,11 @@ class Paper {
     el.style.fontFamily = this.font_name;
     let w = 0,
         h = 0;
-    // Consider the separate lines of the string
-    const
-        lines = ('' + string).split('\n'),  // Add '' in case string is a number
-        ll = lines.length;
-    for(let i = 0; i < ll; i++) {
-      el.textContent = lines[i];
+    // Consider the separate lines of the string.
+    // NOTE: Add '' to force conversion to string in case `string` is a number.
+    const lines = ('' + string).split('\n');
+    for(const l of lines) {
+      el.textContent = l;
       const bb = el.getBBox();
       w = Math.max(w, bb.width);
       h += bb.height;
@@ -673,7 +672,7 @@ class Paper {
   }
   
   removeInvisibleSVG() {
-    // Removes SVG elements used by the user interface (not part of the model)
+    // Remove SVG elements used by the user interface (not part of the model).
     let el = document.getElementById(this.size_box);
     if(el) this.svg.removeChild(el);
     el = document.getElementById(this.drag_line);
@@ -921,35 +920,19 @@ class Paper {
     // NOTE: Product positions must be updated before links are drawn, so
     // that links arrows will be drawn over their shapes.
     fc.positionProducts();
-    for(let i = 0; i < fc.processes.length; i++) {
-      fc.processes[i].clearHiddenIO();
-    }
-    for(let i = 0; i < fc.sub_clusters.length; i++) {
-      fc.sub_clusters[i].clearHiddenIO();
-    }
+    for(const p of fc.processes) p.clearHiddenIO();
+    for(const c of fc.sub_clusters) c.clearHiddenIO();
     // NOTE: Also ensure that notes will update their fields.
     fc.resetNoteFields();
     // Draw link arrows and constraints first, as all other entities are
     // slightly transparent so they cannot completely hide these lines.
-    for(let i = 0; i < fc.arrows.length; i++) {
-      this.drawArrow(fc.arrows[i]);
-    }
-    for(let i = 0; i < fc.related_constraints.length; i++) {
-      this.drawConstraint(fc.related_constraints[i]);
-    }
-    for(let i = 0; i < fc.processes.length; i++) {
-      this.drawProcess(fc.processes[i]);
-    }
-    for(let i = 0; i < fc.product_positions.length; i++) {
-      this.drawProduct(fc.product_positions[i].product);
-    }
-    for(let i = 0; i < fc.sub_clusters.length; i++) {
-      this.drawCluster(fc.sub_clusters[i]);
-    }
+    for(const a of fc.arrows) this.drawArrow(a);
+    for(const c of fc.related_constraints) this.drawConstraint(c);
+    for(const p of fc.processes) this.drawProcess(p);
+    for(const pp of fc.product_positions) this.drawProduct(pp.product);
+    for(const c of fc.sub_clusters) this.drawCluster(c);
     // Draw notes last, as they are semi-transparent (and can be quite small).
-    for(let i = 0; i < fc.notes.length; i++) {
-      this.drawNote(fc.notes[i]);
-    }
+    for(const n of fc.notes) this.drawNote(n);
     // Resize paper if necessary.
     this.extend();
     // Display model name in browser.
@@ -961,8 +944,7 @@ class Paper {
     // without a mouseout event.
     this.constraint_under_cursor = null;
     // Draw the selected entities and associated links, and also constraints.
-    for(let i = 0; i < mdl.selection.length; i++) {
-      const obj = mdl.selection[i];
+    for(const obj of mdl.selection) {
       // Links and constraints are drawn separately, so do not draw those
       // contained in the selection.
       if(!(obj instanceof Link || obj instanceof Constraint)) {
@@ -974,18 +956,13 @@ class Paper {
       mdl.selection_related_arrows = mdl.focal_cluster.selectedArrows();
     }
     // Only draw the arrows that relate to the selection.
-    for(let i = 0; i < mdl.selection_related_arrows.length; i++) {
-      this.drawArrow(mdl.selection_related_arrows[i]);
-    }
+    for(const a of mdl.selection_related_arrows) this.drawArrow(a);
     // As they typically are few, simply redraw all constraints that relate to
     // the focal cluster.
-    for(let i = 0; i < mdl.focal_cluster.related_constraints.length; i++) {
-      this.drawConstraint(mdl.focal_cluster.related_constraints[i]);
-    }
+    for(const c of mdl.focal_cluster.related_constraints) this.drawConstraint(c);
     this.extend(); 
   }
 
-  
   //
   // Shape-drawing methods for model entities
   //
@@ -1026,8 +1003,7 @@ class Paper {
       // Distinguish between input, output and io products.
       let ip = [], op = [], iop = [];
       if(cnb instanceof Cluster) {
-        for(let i = 0; i < arrw.links.length; i++) {
-          const lnk = arrw.links[i];
+        for(const lnk of arrw.links) {
           // Determine which product is involved.
           prod = (lnk.from_node instanceof Product ? lnk.from_node : lnk.to_node);
           // NOTE: Clusters "know" their input/output products.
@@ -1041,8 +1017,7 @@ class Paper {
         }
       } else {
         // `cnb` is process or product => knows its inputs and outputs.
-        for(let i = 0; i < arrw.links.length; i++) {
-          const lnk = arrw.links[i];
+        for(const lnk of arrw.links) {
           if(lnk.from_node === cnb) {
             addDistinct(lnk.to_node, op);
           } else {
@@ -1069,9 +1044,8 @@ class Paper {
         to_p = to_nb instanceof Process;
     let data_flows = 0;
     if(arrw.links.length > 1 || (from_c && to_p) || (from_p && to_c)) {
-      for(let i = 0; i < arrw.links.length; i++) {
+      for(const lnk of arrw.links) {
         const
-            lnk = arrw.links[i],
             fn = lnk.from_node,
             tn = lnk.to_node;
         if(fn instanceof Product && fn != from_nb && fn != to_nb) {
@@ -1879,12 +1853,10 @@ class Paper {
             stroke: stroke_color, 'stroke-width': stroke_width});
     svg.appendChild(el);
     // Add the bound line contours
-    for(let i = 0; i < c.bound_lines.length; i++) {
-      const
-          bl = c.bound_lines[i],
-          // Draw thumbnail in shades of the arrow color, but use black
-          // for regular color or the filled areas turn out too light.
-          clr = (stroke_color === this.palette.node_rim ? 'black' : stroke_color);
+    for(const bl of c.bound_lines) {
+      // Draw thumbnail in shades of the arrow color, but use black
+      // for regular color or the filled areas turn out too light.
+      const clr = (stroke_color === this.palette.node_rim ? 'black' : stroke_color);
       // Set the boundline point coordinates (TRUE indicates: also compute
       // the thumbnail SVG).
       bl.setDynamicPoints(MODEL.t, true);
@@ -2811,7 +2783,7 @@ class Paper {
         'v', h - shadow_width, 'h-', w - shadow_width, 'z'],
         {fill: fill_color, stroke: stroke_color, 'stroke-width': stroke_width});
     if(clstr.ignore) {
-      // Draw diagonal cross
+      // Draw diagonal cross.
       clstr.shape.addPath(['m', x - hw + 6, ',', y - hh + 6,
           'l', w - 12 - shadow_width, ',', h - 12 - shadow_width,
           'm', 12 - w + shadow_width, ',0',
@@ -2820,7 +2792,7 @@ class Paper {
               'stroke-linecap': 'round'});
     }
     if(!clstr.collapsed) {
-      // Draw text
+      // Draw text.
       const
           lcnt = clstr.name_lines.split('\n').length,
           cy = (clstr.hasActor ? y - 12 / (lcnt + 1) : y);
@@ -2835,14 +2807,14 @@ class Paper {
                 {'font-size': 12, fill: this.palette.actor_font,
                     'font-style': 'italic'});
         let any = cy + th/2 + 7;
-        for(let i = 0; i < anl.length; i++) {
-          clstr.shape.addText(x, any, anl[i], format);
+        for(const an of anl) {
+          clstr.shape.addText(x, any, an, format);
           any += 12;
         }
       }
     }
     if(MODEL.show_block_arrows && !ignored) {
-      // Add block arrows for hidden IO links
+      // Add block arrows for hidden IO links.
       clstr.shape.addBlockArrow(x - hw + 3, y - hh + 15, UI.BLOCK_IN,
           clstr.hidden_inputs.length);
       clstr.shape.addBlockArrow(x + hw - 4, y - hh + 15, UI.BLOCK_OUT,

package/static/scripts/linny-r-gui-power-grid-manager.js

@@ -38,7 +38,7 @@ class PowerGridManager {
     // Add the power grids modal
     this.dialog = new ModalDialog('power-grids');
     this.dialog.close.addEventListener('click',
-        () => POWER_GRID_MANAGER.dialog.hide());
+        () => POWER_GRID_MANAGER.closeDialog());
     // Make the add, edit and delete buttons of this modal responsive
     this.dialog.element('new-btn').addEventListener('click',
         () => POWER_GRID_MANAGER.promptForPowerGrid());
@@ -96,8 +96,8 @@ class PowerGridManager {
       html.push('<div id="', modal, '-gm-none" class="no-grid-plate" ',
           'title="No grid element" onclick="UI.setGridPlate(event.target)">',
           '(&#x21AF;)</div>');
-      for(let i = 0; i < grids.length; i++) {
-        const pg = MODEL.power_grids[grids[i]];
+      for(const g of grids) {
+        const pg = MODEL.power_grids[g];
         html.push('<div id="', modal, '-gm-', pg.id,
             '"class="menu-plate" style="background-color: ', pg.color,
             '" title="Element of grid &ldquo;', pg.name,
@@ -147,7 +147,7 @@ class PowerGridManager {
             pg.color, '">', pg.voltage, '</div>',
             '<div class="grid-watts">', pg.power_unit, '</div>',
             (pg.kirchhoff ?
-                '<div class="grid-kcl-symbol">&#x27F3;</div>': ''),
+                '<div class="grid-kvl-symbol">&#x27F3;</div>': ''),
             (pg.loss_approximation ?
                 '<div class="grid-loss-symbol">L&sup' +
                 pg.loss_approximation + ';</div>' : ''),
@@ -155,6 +155,9 @@ class PowerGridManager {
       }
     }
     this.table.innerHTML = sl.join('');
+    UI.setBox('power-grids-capacity', MODEL.ignore_grid_capacity);
+    UI.setBox('power-grids-KVL', MODEL.ignore_KVL);
+    UI.setBox('power-grids-losses', MODEL.ignore_power_losses);
     if(ss) UI.scrollIntoView(document.getElementById(ssid));
     const btns = 'power-grids-edit power-grids-delete';
     if(ss) {
@@ -163,6 +166,14 @@ class PowerGridManager {
       UI.disableButtons(btns);
     }
   }
+  
+  closeDialog() {
+    // Save checkbox status and hide the dialog.
+    MODEL.ignore_grid_capacity = UI.boxChecked('power-grids-capacity');
+    MODEL.ignore_KVL = UI.boxChecked('power-grids-KVL');
+    MODEL.ignore_power_losses = UI.boxChecked('power-grids-losses');
+    this.dialog.hide();
+  }
 
   selectPowerGrid(event, id, focus) {
     // Select power grid, and when double-clicked, allow to edit it.
@@ -261,7 +272,7 @@ class PowerGridManager {
   }
   
   checkLengths() {
-    // Calculate lengt statistics for all grid processes.
+    // Calculate length statistics for all grid processes.
     this.min_length = 1e+10;
     this.max_length = 0;
     this.total_length = 0;
@@ -294,8 +305,7 @@ class PowerGridManager {
         const mlmsg = [];
         let fn = null,
             tn = null;
-        for(let i = 0; i < p.inputs.length; i++) {
-          const l = p.inputs[i];
+        for(const l of p.inputs) {
           if(l.multiplier === VM.LM_LEVEL &&
               !MODEL.ignored_entities[l.identifier]) {
             if(fn) {
@@ -306,8 +316,7 @@ class PowerGridManager {
           }
         }
         if(!fn) mlmsg.push('no inputs');
-        for(let i = 0; i < p.outputs.length; i++) {
-          const l = p.outputs[i];
+        for(const l of p.outputs) {
           if(l.multiplier === VM.LM_LEVEL &&
               !MODEL.ignored_entities[l.identifier]) {
             if(tn) {
@@ -405,9 +414,7 @@ class PowerGridManager {
     // from `fn` to `tn` in the spanning tree of this grid.
     // If edge connects path with TO node, `path` is complete.
     if(fn === tn) return true;
-    const elist = this.tree_incidence[fn];
-    for(let i = 0; i < elist.length; i++) {
-      const e = elist[i];
+    for(const e of this.tree_incidence[fn]) {
       // Ignore edges already in the path.
       if(path.indexOf(e) < 0) {
         // NOTE: Edges are directed, but should not be considered as such.
@@ -426,10 +433,8 @@ class PowerGridManager {
     if(!(MODEL.with_power_flow && MODEL.powerGridsWithKVL.length)) return;
     this.inferNodesAndEdges();
     this.inferSpanningTree();
-    for(let i = 0; i < this.cycle_edges.length; i++) {
-      const
-          edge = this.cycle_edges[i],
-          path = [];
+    for(const edge of this.cycle_edges) {
+      const path = [];
       if(this.pathInSpanningTree(edge.from_node, edge.to_node, path)) {
         // Add flags that indicate whether the edge on the path is reversed.
         // The closing edge determines the orientation.
@@ -460,11 +465,10 @@ class PowerGridManager {
       const
           c = this.cycle_basis[i],
           l = [];
-      for(let j = 0; j < c.length; j++) {
-        l.push(c[j].process.displayName +
-            ` [${c[j].orientation > 0 ? '+' : '-'}]`);
+      for(const e of c) {
+        l.push(`${e.process.displayName} [${e.orientation > 0 ? '+' : '-'}]`);
       }
-      ll.push(`(${i+1}) ${l.join(', ')}`);
+      ll.push(`(${i + 1}) ${l.join(', ')}`);
     }
     return ll.join('\n');
   }
@@ -477,9 +481,8 @@ class PowerGridManager {
         '<th title="Reactance"><em>x</em></th><th title="Power">P</th>' +
         '<th><em>x</em>P</th></tr>'];
     let sum = 0;
-    for(let i = 0; i < c.length; i++) {
+    for(const edge of c) {
       const
-          edge = c[i],
           p = edge.process,
           x = p.length_in_km * p.grid.reactancePerKm,
           l = p.actualLevel(MODEL.t);
@@ -498,16 +501,12 @@ class PowerGridManager {
 
   inCycle(p) {
     // Return TRUE if process `p` is an edge in some cycle in the cycle basis.
-    for(let i = 0; i < this.cycle_basis.length; i++) {
-      const c = this.cycle_basis[i];
-      for(let j = 0; j < c.length; j++) {
-        if(c[j].process === p) return true;
-      }
+    for(const c of this.cycle_basis) {
+      for(const e of c) if(e.process === p) return true;
     }
     return false;
   }
   
-  
   allCycleFlows(p) {
     // Return power flows for each cycle that `p` is part of as an HTML
     // table (so it can be displayed in the documentation dialog).
@@ -515,12 +514,10 @@ class PowerGridManager {
     const flows = [];
     for(let i = 0; i < this.cycle_basis.length; i++) {
       const c = this.cycle_basis[i];
-      for(let j = 0; j < c.length; j++) {
-        if(c[j].process === p) {
-          flows.push(`<h3>Flows through cycle (${i}):</h3>`,
-              this.cycleFlowTable(c));
-          break;
-        }
+      for(const e of c) if(e.process === p) {
+        flows.push(`<h3>Flows through cycle (${i}):</h3>`,
+            this.cycleFlowTable(c));
+        break;
       }
     }
     return flows.join('\n');

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

@@ -241,8 +241,7 @@ class GUIReceiver {
       // NOTE: The @ will be replaced by the run number, so that that
       // number precedes the clock time. The @ will be unique because
       // `asFileName()` replaces special characters by underscores. 
-      file = REPOSITORY_BROWSER.asFileName(MODEL.name || 'model') +
-          '@-' + compactClockTime();
+      file = asFileName(MODEL.name || 'model') + '@-' + compactClockTime();
     }
     if(MODEL.solved && !VM.halted) {
       // Normal execution termination => report results