linny-r 2.0.11 → 2.1.0

package/package.json

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

package/static/index.html

@@ -914,6 +914,8 @@ NOTE: Products directly linked to such processes should have a proportional unit
              title="Include module in current model">
         <img id="repo-load-btn" class="btn disab" src="images/open.png"
              title="Load model from repository">
+        <img id="repo-update-btn" class="btn disab" src="images/update.png"
+             title="Update clusters that have been included in the model">
         <img id="repo-store-btn" class="btn enab" src="images/store.png"
              title="Store model as module in repository">
         <img id="repo-black-box-btn" class="btn enab" src="images/black-box.png"
@@ -1061,9 +1063,6 @@ NOTE: Products directly linked to such processes should have a proportional unit
         <img class="cancel-btn" src="images/cancel.png">
         <img class="ok-btn" src="images/ok.png">
       </div>
-      <div style="margin:2px; background-color: Yellow">
-        <strong>NOTE:</strong> <em>This action cannot be undone!</em>
-      </div>
       <div style="margin:2px">
         <label>Cluster:</label>
         <input id="include-prefix" type="text"
@@ -1082,6 +1081,38 @@ NOTE: Products directly linked to such processes should have a proportional unit
     </div>
   </div>  
 
+  <!-- the UPDATE dialog prompts for a module name -->
+  <div id="update-modal" class="modal">
+    <div id="update-dlg" class="inp-dlg" style="min-width: 320px">
+      <div class="dlg-title">
+        Update clusters previously included from a module
+        <img class="cancel-btn" src="images/cancel.png">
+        <img class="ok-btn" src="images/ok.png">
+      </div>
+      <div style="padding: 2px">
+        <div>
+          Update using module: <span id="update-name"></span>
+        </div>
+        <div>
+          <label>Clusters based on:</label>
+          <select id="update-module">
+          </select>
+          <div id="update-count" class="update-cc"></div>
+        </div>
+        <div id="update-issues">
+          <div id="update-issues-header"></div>
+          <div id="update-issues-area"></div>
+        </div>
+        <div id="update-remove">
+          <div id="update-remove-header">
+            <span id="update-remove-count"></span> will be removed
+          </div>
+          <div id="update-remove-area"></div>
+        </div>
+      </div>
+    </div>
+  </div>  
+
   <!-- the CONFIRM LOAD modal asks to confirm to load model from repository -->
   <div id="confirm-load-from-repo-modal" class="modal">
     <div id="confirm-load-from-repo-dlg" class="inp-dlg">

package/static/linny-r.css

@@ -607,6 +607,11 @@ span.node-details {
   margin-left: 15px;
 }
 
+span.mod-name {
+  font-style: normal;
+  color: #403080;  
+}
+
 #issue-panel {
   display: none;
   background-color: Yellow;
@@ -707,6 +712,11 @@ img.inline-cancel-btn:hover {
   filter: brightness(120%);
 }
 
+img.ok-btn.disab {
+  filter: saturate(0%) brightness(150%) contrast(70%);
+  pointer-events: none;
+}
+
 #actor-group,
 #constraint-group,
 #cluster-group,
@@ -4152,8 +4162,9 @@ td.sa-not-run {
 
 #xp-ignore-count {
   position: absolute;
-  right: 14px;
+  right: 2px;
   bottom: 3px;
+  width: 18px;
   height: 16px;
   font-size: 9px;
   color: #806070;
@@ -4882,6 +4893,7 @@ span.sd-clear {
 }
 
 #paste-dlg,
+#update-dlg,
 #include-dlg {
   width: 320px;
   height: min-content;
@@ -4907,9 +4919,29 @@ span.sd-clear {
   margin-left: 9px;
 }
 
+#update-name {
+  font-family: monospace;
+  font-size: 14px;
+}
+
+div.update-cc {
+  display: inline-block;
+  margin-left: 6px;
+  font-style: italic;
+  color: Gray;
+}
+
+#update-remove-header,
+#update-issues-header {
+  font-weight: bold;
+  margin: 4px 2px 2px 2px;
+}
+
 #paste-scroll-area,
-#include-scroll-area {
-  margin: 2px;
+#include-scroll-area,
+#update-remove-area,
+#update-issues-area {
+  margin: 0 2px;
   height: min-content;
   max-height: 350px !important;
   width: calc(100% - 4px);
@@ -4918,6 +4950,13 @@ span.sd-clear {
   overflow-y: auto;
 }
 
+#update-remove-area,
+#update-issues-area {
+  max-height: 150px !important;
+  background-color: white;
+  border: 1px solid Silver;
+}
+
 div.paste-tactic {
   display: inline-block;
   vertical-align: top;

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

@@ -311,6 +311,12 @@ class Controller {
         (name.startsWith(this.BLACK_BOX) || name[0].match(/[\w]/));
   }
   
+  realActorName(name) {
+    // Return `name` unless it is '(no actor)'; then return empty string.
+    if(name === this.NO_ACTOR) return '';
+    return name;
+  }
+  
   prefixesAndName(name, key=false) {
     // Returns name split exclusively at '[non-space]: [non-space]'
     let sep = this.PREFIXER,
@@ -1266,30 +1272,30 @@ class ExperimentManager {
   }
 
   startExperiment(n=-1) {
-    // Recompile expressions, as these may have been changed by the modeler
+    // Recompile expressions, as these may have been changed by the modeler.
     MODEL.compileExpressions();
-    // Start sequence of solving model parametrizations
+    // Start sequence of solving model parametrizations.
     const x = this.selected_experiment;
     if(x) {
-      // Store original model settings
+      // Store original model settings.
       x.original_model_settings = MODEL.settingsString;
       x.original_round_sequence = MODEL.round_sequence;
-      // NOTE: switch off run chart display
+      // NOTE: Switch off run chart display.
       CHART_MANAGER.setRunsChart(false);
       // When Chart manager is showing, close it and notify modeler that charts
-      // should not be viewed during experiments
+      // should not be viewed during experiments.
       if(CHART_MANAGER.visible) {
         UI.buttons.chart.dispatchEvent(new Event('click'));
         UI.notify(UI.NOTICE.NO_CHARTS);
       }
-      // Change the buttons -- will return TRUE if experiment was paused
+      // Change the buttons -- will return TRUE if experiment was paused.
       const paused = this.resumeButtons();
       if(x.completed && n >= 0) {
         x.single_run = n; 
         x.active_combination_index = n;
         MODEL.running_experiment = x;
       } else if(!paused) {
-        // Clear previous run results (if any) unless resuming
+        // Clear previous run results (if any) unless resuming.
         x.clearRuns();
         x.inferVariables();
         x.time_started = new Date().getTime();
@@ -1369,11 +1375,14 @@ class ExperimentManager {
     // Perform post-processing after run results have been added.
     const x = MODEL.running_experiment;
     if(!x) return;
-    const aci = x.active_combination_index;
+    const
+        aci = x.active_combination_index,
+        single = (aci == x.single_run);
     // Always add solver messages.
     x.runs[aci].addMessages();
     const n = x.combinations.length;
-    if(!VM.halted && aci < n - 1 && aci != x.single_run) {
+    if(!VM.halted && aci < n - 1 && !single) {
+      // Continue with the next run.
       if(this.must_pause) {
         this.pausedButtons(aci);
         this.must_pause = false;
@@ -1384,12 +1393,13 @@ class ExperimentManager {
         // NOTE: When executing a remote command, wait for 1 second to
         // allow enough time for report writing.
         if(RECEIVER.active && RECEIVER.experiment) {
-          UI.setMessage('Reporting run #' + (x.active_combination_index - 1));
+          UI.setMessage('Reporting run #' + aci);
           delay = 1000;
         }
         setTimeout(() => EXPERIMENT_MANAGER.runModel(), delay);
       }
     } else {
+      // Stop the run sequence.
       x.time_stopped = new Date().getTime();
       if(x.single_run >= 0) {
         x.single_run = -1;
@@ -1409,18 +1419,19 @@ class ExperimentManager {
         RECEIVER.experiment = '';
         RECEIVER.callBack();
       }
-      // Restore original model settings
+      // Restore original model settings.
       MODEL.running_experiment = null;
       MODEL.parseSettings(x.original_model_settings);
       MODEL.round_sequence = x.original_round_sequence;
       // Reset the Virtual Machine so t=0 at the status line,
       // and ALL expressions are reset as well.
-      VM.reset();
+      if(!single) VM.reset();
       this.readyButtons();
     }
     this.drawTable();
     // Reset the model, as results of last run will be showing still.
-    UI.resetModel();
+    // NOTE: Do NOT do this after a single run.
+    if(!single) UI.resetModel();
     CHART_MANAGER.resetChartVectors();
     // NOTE: Clear chart only when done; charts do not update when an
     // experiment is running.

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

@@ -224,10 +224,10 @@ class ActorManager {
   }
   
   showEditActorDialog(name, expr) {
-    // Display modal for editing properties of one actor
+    // Display modal for editing properties of one actor.
     this.actor_span.innerHTML = name;
     this.actor_name.value = name;
-    // Do not allow modification of the name '(no actor)'
+    // Do not allow modification of the name '(no actor)'.
     if(name === UI.NO_ACTOR) {
       this.actor_name.disabled = true;
       this.actor_io.style.display = 'none';
@@ -242,22 +242,22 @@ class ActorManager {
   
   modifyActorEntry() {
     // This method is called when the modeler submits the "actor properties"
-    // dialog
+    // dialog.
     let n = this.actor_span.innerHTML,
         nn = UI.NO_ACTOR,
         x = this.actor_weight.value.trim(),
         xp = new ExpressionParser(x);
     if(n !== UI.NO_ACTOR) {
       nn = this.actor_name.value.trim();
-      // NOTE: prohibit colons in actor names to avoid confusion with
-      // prefixed entities
+      // NOTE: Prohibit colons in actor names to avoid confusion with
+      // prefixed entities.
       if(!UI.validName(nn) || nn.indexOf(':') >= 0) {
         UI.warn(UI.WARNING.INVALID_ACTOR_NAME);
         return false;
       }
     }
     if(xp.error) {
-      // NOTE: do not pass the actor, as its name is being edited as well
+      // NOTE: Do not pass the actor, as its name is being edited as well.
       UI.warningInvalidWeightExpression(null, xp.error);
       return false;
     }

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

@@ -637,13 +637,7 @@ class GUIChartManager extends ChartManager {
   deleteChart() {
     // Delete the shown chart (if any).
     if(this.chart_index >= 0) {
-      // NOTE: Do not delete the default chart, but clear it instead.
-      if(MODEL.charts[this.chart_index].title === this.new_chart_title) {
-        MODEL.charts[this.chart_index].reset();
-      } else {
-        MODEL.charts.splice(this.chart_index, 1);
-        this.chart_index = -1;
-      }
+      MODEL.deleteChart(this.chart_index);
       // Also update the experiment viewer, because this chart may be
       // one of the output charts of the selected experiment.
       UI.updateControllerDialogs('CFX');

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

@@ -1710,14 +1710,14 @@ class GUIController extends Controller {
   //
   
   draggableDialog(d) {
-    // Make dialog draggable
+    // Make dialog draggable.
     const
         dlg = document.getElementById(d + '-dlg'),
         hdr = document.getElementById(d + '-hdr');
     let cx = 0,
         cy = 0;
     if(dlg && hdr) {
-      // NOTE: dialogs are draggable only by their header
+      // NOTE: Dialogs are draggable only by their header.
       hdr.onmousedown = dialogHeaderMouseDown;
       dlg.onmousedown = dialogMouseDown;
       return dlg;
@@ -1728,13 +1728,13 @@ class GUIController extends Controller {
     
     function dialogMouseDown(e) {
       e = e || window.event;
-      // NOTE: no `preventDefault` so the header will also receive it
-      // Find the dialog element
+      // NOTE: No `preventDefault`, as this disables selector elements.
+      // Find the dialog element.
       let de = e.target;
       while(de && !de.id.endsWith('-dlg')) { de = de.parentElement; }
-      // Moves the dialog (`this`) to the top of the order
+      // Move the dialog (`this`) to the top of the order.
       const doi = UI.dr_dialog_order.indexOf(de);
-      // NOTE: do not reorder when already at end of list (= at top)
+      // NOTE: Do not reorder when already at end of list (= at top).
       if(doi >= 0 && doi !== UI.dr_dialog_order.length - 1) {
         UI.dr_dialog_order.splice(doi, 1);
         UI.dr_dialog_order.push(de);
@@ -1745,12 +1745,12 @@ class GUIController extends Controller {
     function dialogHeaderMouseDown(e) {
       e = e || window.event;
       e.preventDefault();
-      // Find the dialog element
+      // Find the dialog element.
       let de = e.target;
       while(de && !de.id.endsWith('-dlg')) { de = de.parentElement; }
-      // Record the affected dialog
+      // Record the affected dialog.
       UI.dr_dialog = de;
-      // Get the mouse cursor position at startup
+      // Get the mouse cursor position at startup.
       cx = e.clientX;
       cy = e.clientY;
       document.onmouseup = stopDragDialog;
@@ -2258,6 +2258,8 @@ class GUIController extends Controller {
     this.net_move_y = 0;
     // Get the paper coordinates indicated by the cursor.
     const cp = this.paper.cursorPosition(e.pageX, e.pageY);
+    this.mouse_x = cp[0];
+    this.mouse_y = cp[1];
     this.mouse_down_x = cp[0];
     this.mouse_down_y = cp[1];
     // De-activate "stay active" buttons if dysfunctional, or if SHIFT,
@@ -2977,7 +2979,7 @@ class GUIController extends Controller {
   // 
 
   validNames(nn, an='') {
-    // Check whether names meet conventions; if not, warn user
+    // Check whether names meet conventions. If not, warn user.
     if(!UI.validName(nn) || nn.indexOf(UI.BLACK_BOX) >= 0) {
       this.warningInvalidName(nn);
       return false;
@@ -3146,10 +3148,10 @@ class GUIController extends Controller {
     UI.info_line.classList.remove(...UI.info_line.classList);
   }
 
-  setMessage(msg, type=null) {
+  setMessage(msg, type=null, cause=null) {
     // Display `msg` on infoline unless no type (= plain text) and some
     // info, warning or error message is already displayed.
-    super.setMessage(msg, type);
+    super.setMessage(msg, type, cause);
     const types = ['notification', 'warning', 'error'];
     let d = new Date(),
         t = d.getTime(),
@@ -3664,7 +3666,7 @@ class GUIController extends Controller {
     // proceed to paste.
     const
         md = this.paste_modal,
-        mapping = Object.assign(md.mapping, {}),
+        mapping = Object.assign({}, md.mapping),
         tc = (mapping.top_clusters ?
             Object.keys(mapping.top_clusters).sort(ciCompare) : []),
         ft = (mapping.from_to ?
@@ -3906,8 +3908,8 @@ class GUIController extends Controller {
     mapping.shared_prefix = sp;
     mapping.from_prefix = (fpn ? sp + fpn + UI.PREFIXER : sp);
     mapping.to_prefix = (tpn ? sp + tpn + UI.PREFIXER : sp);
-    mapping.from_actor = (ca === UI.NO_ACTOR ? '' : ca);
-    mapping.to_actor = (fca === UI.NO_ACTOR ? '' : fca);
+    mapping.from_actor = UI.realActorName(ca);
+    mapping.to_actor = UI.realActorName(fca);
     // Prompt for mapping when pasting to the same model and cluster.
     if(parseInt(mts) === MODEL.time_created.getTime() &&
         ca === fca && mapping.from_prefix === mapping.to_prefix &&
@@ -4544,8 +4546,7 @@ console.log('HERE name conflicts', name_conflicts, mapping);
     md.group = group;
     md.element('action').innerText = 'Edit';
     md.element('name').value = c.name;
-    md.element('actor').value = (c.actor.name == UI.NO_ACTOR ?
-        '' : c.actor.name);
+    md.element('actor').value = UI.realActorName(c.actor.name);
     md.element('options').style.display = 'block';
     this.setBox('cluster-collapsed', c.collapsed);
     this.setBox('cluster-ignore', c.ignore);

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

@@ -289,17 +289,6 @@ class GUIDatasetManager extends DatasetManager {
     return null;
   }
   
-  datasetsByPrefix(prefix) {
-    // Return the list of datasets having the specified prefix.
-    const
-        pid = UI.nameToID(prefix + UI.PREFIXER),
-        dsl = [];
-    for(const k of Object.keys(MODEL.datasets)) {
-      if(k.startsWith(pid)) dsl.push(k);
-    }
-    return dsl;
-  }
-
   selectPrefixRow(e) {
     // Select expand/collapse prefix row.
     this.focal_table = this.dataset_table;
@@ -310,7 +299,7 @@ class GUIDatasetManager extends DatasetManager {
     const toggle = r.classList.contains('tree-btn');
     while(r.tagName !== 'TR') r = r.parentNode;
     this.selected_prefix_row = r;
-    this.prefixed_datasets = this.datasetsByPrefix(r.dataset.prefix);
+    this.prefixed_datasets = MODEL.datasetKeysByPrefix(r.dataset.prefix);
     const sel = this.dataset_table.getElementsByClassName('sel-set');
     this.selected_dataset = null;
     if(sel.length > 0) {
@@ -746,7 +735,7 @@ class GUIDatasetManager extends DatasetManager {
   }
   
   get selectedAsList() {
-  // Return list of datasets selected directly or by prefix.
+    // Return list of datasets selected directly or by prefix.
     const dsl = [];
     // Prevent including the equations dataset (just in case).
     if(this.selected_dataset && this.selected_dataset !== MODEL.equations_dataset) {
@@ -1243,12 +1232,14 @@ class GUIDatasetManager extends DatasetManager {
       for(let j = 0; j < ncol; j++) {
         const
             v = dsv[j].trim(),
-            sf = safeStrToFloat(v, '');
-        if(sf === '' && v !== '') {
+            sf = safeStrToFloat(v, NaN);
+        // NOTE: Ignore empty strings, but this may "shift up" numerical values on later rows.
+        if(isNaN(sf) && v !== '') {
           UI.warn(`Invalid numerical value "${v}" for <strong>${dsn[j]}</strong> on line ${i}`);
           return false;
+        } else if(!isNaN(sf)) {
+          dsa[j].push(sf);
         }
-        dsa[j].push(sf);
       }
     }
     // Add or update datasets.
@@ -1261,7 +1252,7 @@ class GUIDatasetManager extends DatasetManager {
           ods = MODEL.namedObjectByID(id),
           ds = ods || MODEL.addDataset(n);
       // NOTE: `ds` will now be either a new dataset or an existing one.
-      if(ds) {
+      if(ds instanceof Dataset) {
         // Keep track of added/updated datasets.
         const
             odv = ds.default_value,
@@ -1274,6 +1265,8 @@ class GUIDatasetManager extends DatasetManager {
           added++;
         }
         ds.computeStatistics();
+      } else {
+        UI.warn(`Name conflict: ${ds.type} "${ds.displayName}" already exists`);
       }
     }
     // Notify modeler of changes (if any).

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

@@ -844,8 +844,8 @@ class GUIExperimentManager extends ExperimentManager {
   }
   
   showInfo(n, shift) {
-    // Display documentation for the n-th experiment defined in the model
-    // NOTE: skip when viewer is showing!
+    // Display documentation for the n-th experiment defined in the model.
+    // NOTE: Skip when viewer is showing!
     if(!UI.hidden('experiment-viewer')) return;
     if(n < MODEL.experiments.length) {
       // NOTE: mouse move over title in viewer passes n = -1 
@@ -856,7 +856,7 @@ class GUIExperimentManager extends ExperimentManager {
   
   showRunInfo(n, shift) {
     // Display information on the n-th combination if docu-viewer is visible
-    // and cursor is moved over run cell while Shift button is held down
+    // and cursor is moved over run cell while Shift button is held down.
     if(shift && DOCUMENTATION_MANAGER.visible) {
       const info = this.runInfo(n);
       if(info) {

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

@@ -949,7 +949,16 @@ class Finder {
         }
       }
       // Set the new default selector (if changed).
-      if(md.new_defsel !== false) ds.default_selector = md.new_defsel;
+      if(md.new_defsel !== false) {
+        // NOTE: `new_defsel` is a key; the actual selector name may have upper case
+        // letters, so get the selector name.
+        const dsm = ds.modifiers[md.new_defsel];
+        if(dsm) {
+          ds.default_selector = dsm.selector;
+        } else {
+          throw(`Unknown selector: ${md.new_defsel}`);
+        }
+      }
     }
     // Notify modeler of changes (if any).
     const msg = [];

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

@@ -1955,7 +1955,7 @@ class Paper {
     let l = (MODEL.solved ? proc.actualLevel(MODEL.t) : VM.NOT_COMPUTED),
         lb = proc.lower_bound.result(MODEL.t),
         ub = (proc.equal_bounds ? lb : proc.upper_bound.result(MODEL.t));
-    // NOTE: by default, lower bound = 0 (but do show exceptional values)
+    // NOTE: By default, lower bound = 0 (but do show exceptional values).
     if(lb === VM.UNDEFINED && !proc.lower_bound.defined) lb = 0;
     let hw,
         hh,
@@ -2766,6 +2766,15 @@ class Paper {
         'h-', w - shadow_width, 'v-', shadow_width,
         'h', w - 2*shadow_width, 'z'],
         {fill:stroke_color, stroke:stroke_color, 'stroke-width':stroke_width});
+    if(clstr.module) {
+      // Add three white dots at middle of bottom shade.
+      const
+          ely = y + hh - shadow_width / 2,
+          elfill = {fill: 'white'};
+      clstr.shape.addEllipse(x - 4, ely, 1, 1, elfill);
+      clstr.shape.addEllipse(x, ely, 1, 1, elfill);
+      clstr.shape.addEllipse(x + 4, ely, 1, 1, elfill);
+    }
     // Set fill color if slack used by some product contained by this cluster
     if(MODEL.t in clstr.slack_info) {
       const s = clstr.slack_info[MODEL.t];