linny-r 1.5.8 → 1.6.1

package/package.json

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

package/static/index.html

@@ -304,8 +304,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
       </svg>
     </div>
   </main>
-  <!-- the footer displays the status bar with X/Y coordinates, zoom in/out buttons, buttons for moving forward/backward
-       in time, and the status line that displays info, notifications, warnings, and error messages
+  <!-- The footer displays the status bar with X/Y coordinates, zoom
+       in/out buttons, buttons for moving forward/backward in time, and
+       the status line that displays info, notifications, warnings, and
+       error messages. The set-up progress bar shows a growing colored
+       needle indicating progress of making Simplex tableau and input
+       file for the solver.
    -->
   <footer>
     <div id="set-up-progress">
@@ -2238,7 +2242,7 @@ NOTE: * and ? will be interpreted as wildcards"
       </div>
       <div id="viewer-selectors">
         <label>Variable:</label>
-        <select id="viewer-variable" style="margin-right: 10px">
+        <select id="viewer-variable">
         </select>
         <label>Statistic:</label>
         <select id="viewer-statistic">

package/static/linny-r.css

@@ -2366,6 +2366,24 @@ td.equation-selector {
   text-overflow: ellipsis;
 }
 
+td.method {
+  color: #1080e0;
+  font-weight: bold;
+}
+
+td.no-object {
+  color: #80a0c0;
+  font-weight: normal;
+}
+
+td.compile-issue {
+  color: #e00000;
+}
+
+td.compute-issue {
+  color: #f08000;
+}
+
 td.wildcard {
   color: #400080;
 }
@@ -3558,6 +3576,7 @@ td.sa-not-run {
 #viewer-variable {
   font-size: 10px;
   max-width: calc(100% - 160px);
+  margin-right: 10px;
 }
 
 #sensitivity-statistic,

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

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

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

@@ -574,7 +574,7 @@ class GUIChartManager extends ChartManager {
   }
   
   cloneChart() {
-    // Creates a new chart that is identical to the current one
+    // Create a new chart that is identical to the current one.
     if(this.chart_index >= 0) {
       let c = MODEL.charts[this.chart_index],
           nt = c.title + '-copy';
@@ -582,7 +582,7 @@ class GUIChartManager extends ChartManager {
         nt += '-copy';
       }
       const nc = MODEL.addChart(nt);
-      // Copy properties of c to nc
+      // Copy properties of `c` to `nc`;
       nc.histogram = c.histogram;
       nc.bins = c.bins;
       nc.show_title = c.show_title;
@@ -609,7 +609,7 @@ class GUIChartManager extends ChartManager {
   }
   
   toggleRunStat() {
-    // Toggles the Boolean property that signals charts that they must
+    // Toggle the Boolean property that signals charts that they must
     // plot the selected statistic for the selected runs if they are
     // part of the selected experiment chart set.
     this.setRunsStat(!this.runs_stat);
@@ -618,16 +618,17 @@ class GUIChartManager extends ChartManager {
   }
   
   deleteChart() {
-    // Deletes the shown chart (if any)
+    // Delete the shown chart (if any).
     if(this.chart_index >= 0) {
-      // NOTE: do not delete the default chart, but clear it
+      // 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;
       }
-      // Also update the experiment viewer (charts define the output variables)
+      // Also update the experiment viewer, because this chart may be
+      // one of the output charts of the selected experiment.
       UI.updateControllerDialogs('CFX');
     }
   }
@@ -689,8 +690,8 @@ class GUIChartManager extends ChartManager {
   }
 
   addVariable(eq='') {
-    // Adds the variable specified by the add-variable-dialog to the chart
-    // NOTE: when defined, `eq` is the selector of the equation to be added
+    // Add the variable specified by the add-variable-dialog to the chart.
+    // NOTE: When defined, `eq` is the selector of the equation to be added.
     if(this.chart_index >= 0) {
       let o = '',
           a = eq;
@@ -698,7 +699,7 @@ class GUIChartManager extends ChartManager {
         o = this.add_variable_modal.selectedOption('name').text;
         a = this.add_variable_modal.selectedOption('attr').text;
       }
-      // NOTE: when equation is added, object specifier is empty string
+      // NOTE: When equation is added, object specifier is empty string.
       if(!o && a) o = UI.EQUATIONS_DATASET_NAME;
       this.variable_index = MODEL.charts[this.chart_index].addVariable(o, a);
       if(this.variable_index >= 0) {

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

@@ -2608,10 +2608,11 @@ class GUIController extends Controller {
     document.body.className = '';
   }
 
-  setProgressNeedle(fraction) {
+  setProgressNeedle(fraction, color='#500080') {
     // Shows a thin purple line just above the status line to indicate progress
     const el = document.getElementById('set-up-progress-bar');
     el.style.width = Math.round(Math.max(0, Math.min(1, fraction)) * 100) + '%';
+    el.style.backgroundColor = color;
   }
   
   hideStayOnTopDialogs() {
@@ -2934,8 +2935,8 @@ class GUIController extends Controller {
       }
       const err = MODEL.cloneSelection(prefix, actor_name, renumber);
       if(err) {
-        // Something went wrong, so do not hide the modal, but focus on the
-        // DOM element returned by the model's cloning method
+        // Something went wrong, so do not hide the modal, but focus on
+        // the DOM element returned by the model's cloning method.
         const el = md.element(err);
         if(el) {
           el.focus();
@@ -2955,7 +2956,7 @@ class GUIController extends Controller {
   }
   
   copySelection() {
-    // Save selection as XML in local storage of the browser
+    // Save selection as XML in local storage of the browser.
     const xml = MODEL.selectionAsXML;
     if(xml) {
       window.localStorage.setItem('Linny-R-selection-XML', xml);
@@ -2966,20 +2967,22 @@ class GUIController extends Controller {
   }
   
   get canPaste() {
+    // Return TRUE if the browser has a recent selection-as-XML object
+    // in its local storage.
     const xml = window.localStorage.getItem('Linny-R-selection-XML');
     if(xml) {
       const timestamp = xml.match(/<copy timestamp="(\d+)"/);
       if(timestamp) { 
         if(Date.now() - parseInt(timestamp[1]) < 8*3600000) return true;
       }
-      // Remove XML from local storage if older than 8 hours
+      // Remove XML from local storage if older than 8 hours.
       window.localStorage.removeItem('Linny-R-selection-XML');
     }
     return false;
   }
   
   promptForMapping(mapping) {
-    // Prompt user to specify name conflict resolution strategy
+    // Prompt user to specify name conflict resolution strategy.
     const md = this.paste_modal;
     md.mapping = mapping;
     md.element('from-prefix').innerText = mapping.from_prefix || '';
@@ -2999,7 +3002,8 @@ class GUIController extends Controller {
     if(tc.length) {
       sl.push('<div style="font-weight: bold; margin:4px 2px 2px 2px">',
         'Names for top-level clusters:</div>');
-      // Add text inputs for selected cluster nodes
+      const sll = sl.length;
+      // Add text inputs for selected cluster nodes.
       for(let i = 0; i < tc.length; i++) {
         const
             ti = mapping.top_clusters[tc[i]],
@@ -3011,11 +3015,14 @@ class GUIController extends Controller {
             '" type="text" style="', state, 'font-size: 12px" value="',
             ti, '"></div></div>');
       }
+      // Remove header when no items were added.
+      if(sl.length === sll) sl.pop();
     }
     if(ft.length) {
       sl.push('<div style="font-weight: bold; margin:4px 2px 2px 2px">',
         'Mapping of nodes to link from/to:</div>');
-      // Add selectors for unresolved FROM/TO nodes
+      const sll = sl.length;
+      // Add selectors for unresolved FROM/TO nodes.
       for(let i = 0; i < ft.length; i++) {
         const ti = mapping.from_to[ft[i]];
         if(ft[i] === ti) {
@@ -3035,15 +3042,17 @@ class GUIController extends Controller {
           sl.push('</div>');
         }
       }
+      // Remove header when no items were added.
+      if(sl.length === sll) sl.pop();
     }
     md.element('scroll-area').innerHTML = sl.join('');
-    // Open dialog, which will call pasteSelection(...) on OK
+    // Open dialog, which will call pasteSelection(...) on OK.
     this.paste_modal.show();
   }
   
   setPasteMapping() {
-    // Updates the paste mapping as specified by the modeler and then
-    // proceeds to paste
+    // Update the paste mapping as specified by the modeler and then
+    // proceed to paste.
     const
         md = this.paste_modal,
         mapping = Object.assign(md.mapping, {}),
@@ -3070,7 +3079,7 @@ class GUIController extends Controller {
   pasteSelection(mapping={}) {
     // If selection has been saved as XML in local storage, test to
     // see whether PASTE would result in name conflicts, and if so,
-    // open the name conflict resolution window
+    // open the name conflict resolution window.
     let xml = window.localStorage.getItem('Linny-R-selection-XML');
     try {
       xml = parseXML(xml);
@@ -3094,7 +3103,7 @@ class GUIController extends Controller {
     // AUXILIARY FUNCTIONS
     
     function fullName(node) {
-      // Returns full entity name inferred from XML node data
+      // Return full entity name inferred from XML node data.
       if(node.nodeName === 'from-to' || node.nodeName === 'selc') {
         const
             n = xmlDecoded(nodeParameterValue(node, 'name')),
@@ -3133,12 +3142,12 @@ class GUIController extends Controller {
     }
     
     function nameAndActor(name) {
-      // Returns tuple [entity name, actor name] if `name` ends with
-      // a parenthesized string that identifies an actor in the selection
+      // Return tuple [entity name, actor name] if `name` ends with a
+      // parenthesized string that identifies an actor in the selection.
       const ai = name.lastIndexOf(' (');
       if(ai < 0) return [name, ''];
       let actor = name.slice(ai + 2, -1);
-      // Test whether parenthesized string denotes an actor
+      // Test whether parenthesized string denotes an actor.
       if(actor_names.indexOf(actor) >= 0 || actor === mapping.actor ||
           actor === mapping.from_actor || actor === mapping.to_actor) {
         name = name.substring(0, ai);
@@ -3149,8 +3158,8 @@ class GUIController extends Controller {
     }
 
     function mappedName(n) {
-      // Returns full name `n` modified according to the mapping
-      // NOTE: links and constraints require two mappings (recursion!)
+      // Returns full name `n` modified according to the mapping.
+      // NOTE: Links and constraints require two mappings (recursion!).
       if(n.indexOf(UI.LINK_ARROW) > 0) {
         const ft = n.split(UI.LINK_ARROW);
         return mappedName(ft[0]) + UI.LINK_ARROW + mappedName(ft[1]);
@@ -3173,7 +3182,7 @@ class GUIController extends Controller {
         const ai = n.lastIndexOf(mapping.from_actor);
         if(ai > 0) return n.substring(0, ai) + mapping.to_actor;
       }
-      // NOTE: specified actor cannot override existing actor
+      // NOTE: specified actor cannot override existing actor.
       if(mapping.actor && !nameAndActor(n)[1]) {
         return `${n} (${mapping.actor})`;
       }
@@ -3190,23 +3199,27 @@ class GUIController extends Controller {
       if(mapping.from_to && mapping.from_to[n]) {
         return mapping.from_to[n];
       }
-      // No mapping => return original name
+      // No mapping => return original name.
       return n;
     }
 
     function nameConflicts(node) {
       // Maps names of entities defined by the child nodes of `node`
-      // while detecting name conflicts
+      // while detecting name conflicts.
       for(let i = 0; i < node.childNodes.length; i++) {
         const c = node.childNodes[i];
         if(c.nodeName !== 'link' && c.nodeName !== 'constraint') {
           const
               fn = fullName(c),
-              mn = mappedName(fn);
+              mn = mappedName(fn),
+              obj = MODEL.objectByName(mn),
+              // Assume that existing products can be added as product
+              // positions if they are not prefixed.
+              add_pp = (obj instanceof Product && mn.indexOf(UI.PREFIXER) < 0);
           // Name conflict occurs when the mapped name is already in use
           // in the target model, or when the original name is mapped onto
-          // different names (this might occur due to modeler input)
-          if(MODEL.objectByName(mn) || (name_map[fn] && name_map[fn] !== mn)) {
+          // different names (this might occur due to modeler input).
+          if((obj && !add_pp) || (name_map[fn] && name_map[fn] !== mn)) {
             addDistinct(fn, name_conflicts);
           } else {
             name_map[fn] = mn;
@@ -3216,10 +3229,10 @@ class GUIController extends Controller {
     }
     
     function addEntityFromNode(node) {
-      // Adds entity to model based on XML node data and mapping
-      // NOTE: do not add if an entity having this type and mapped name
+      // Adds entity to model based on XML node data and mapping.
+      // NOTE: Do not add if an entity having this type and mapped name
       // already exists; name conflicts accross entity types may occur
-      // and result in error messages
+      // and result in error messages.
       const
           et = node.nodeName,
           fn = fullName(node),
@@ -3281,17 +3294,17 @@ class GUIController extends Controller {
         sp = this.sharedPrefix(cn, fcn),
         fpn = (cn === UI.TOP_CLUSTER_NAME ? '' : cn.replace(sp, '')),
         tpn = (fcn === UI.TOP_CLUSTER_NAME ? '' : fcn.replace(sp, ''));
-    // Infer mapping from XML data and focal cluster name & actor name 
+    // Infer mapping from XML data and focal cluster name & actor name.
     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);
-    // Prompt for mapping when pasting to the same model and cluster
+    // 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 &&
         !(mapping.prefix || mapping.actor || mapping.increment)) {
-      // Prompt for names of selected cluster nodes
+      // Prompt for names of selected cluster nodes.
       if(selc_node.childNodes.length && !mapping.prefix) {
         mapping.top_clusters = {};
         for(let i = 0; i < selc_node.childNodes.length; i++) {
@@ -3306,7 +3319,7 @@ class GUIController extends Controller {
       return;
     }
     // Also prompt if FROM and/or TO nodes are not selected, and map to
-    // existing entities
+    // existing entities.
     if(from_tos_node.childNodes.length && !mapping.from_to) {
       const
           ft_map = {},
@@ -3322,7 +3335,7 @@ class GUIController extends Controller {
               'Data' : nodeParameterValue(c, 'type'));
         }
       }
-      // Prompt only for FROM/TO nodes that map to existing nodes
+      // Prompt only for FROM/TO nodes that map to existing nodes.
       if(Object.keys(ft_map).length) {
         mapping.from_to = ft_map;
         mapping.from_to_type = ft_type;
@@ -3333,7 +3346,7 @@ class GUIController extends Controller {
 
     // Only check for selected entities; from-to's and extra's should be
     // used if they exist, or should be created when copying to a different
-    // model
+    // model.
     name_map.length = 0;
     nameConflicts(entities_node);
     if(name_conflicts.length) {
@@ -3352,20 +3365,20 @@ console.log('HERE name conflicts', name_conflicts, mapping);
     for(let i = 0; i < entities_node.childNodes.length; i++) {
       addEntityFromNode(entities_node.childNodes[i]);
     }
-    // Update diagram, showing newly added nodes as selection
+    // Update diagram, showing newly added nodes as selection.
     MODEL.clearSelection();
     for(let i = 0; i < selection_node.childNodes.length; i++) {
       const
           n = xmlDecoded(nodeContent(selection_node.childNodes[i])),
           obj = MODEL.objectByName(mappedName(n));
       if(obj) {
-        // NOTE: selected products must be positioned
+        // NOTE: Selected products must be positioned.
         if(obj instanceof Product) MODEL.focal_cluster.addProductPosition(obj);
         MODEL.select(obj);
       }
     }
     // Force redrawing the selection to ensure that links to positioned
-    // products are displayed as arrows instead of block arrows
+    // products are displayed as arrows instead of block arrows.
     fc.clearAllProcesses();
     UI.drawDiagram(MODEL);
     this.paste_modal.hide();

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

@@ -486,12 +486,14 @@ class GUIDatasetManager extends DatasetManager {
           m = sd.modifiers[UI.nameToID(msl[i])],
           wild = m.hasWildcards,
           defsel = (m.selector === sd.default_selector),
+          issue = (m.expression.compile_issue ? ' compile-issue' :
+              (m.expression.compute_issue ? ' compute-issue' : '')),
           clk = '" onclick="DATASET_MANAGER.selectModifier(event, \'' +
               m.selector + '\'';
       if(m === sm) smid += i;
       ml.push(['<tr id="dsmtr', i, '" class="dataset-modif',
           (m === sm ? ' sel-set' : ''),
-          '"><td class="dataset-selector',
+          '"><td class="dataset-selector', issue,
           (wild ? ' wildcard' : ''),
           '" title="Shift-click to ', (defsel ? 'clear' : 'set as'),
           ' default modifier',
@@ -499,7 +501,10 @@ class GUIDatasetManager extends DatasetManager {
           (defsel ? '<img src="images/solve.png" style="height: 14px;' +
               ' width: 14px; margin: 0 1px -3px -1px;">' : ''),
           (wild ? wildcardFormat(m.selector, true) : m.selector),
-          '</td><td class="dataset-expression',
+          '</td><td class="dataset-expression', issue,
+          (issue ? '"title="' +
+              safeDoubleQuotes(m.expression.compile_issue ||
+                  m.expression.compute_issue) : ''),
           clk, ');">', m.expression.text, '</td></tr>'].join(''));
     }
     this.modifier_table.innerHTML = ml.join('');
@@ -654,14 +659,14 @@ class GUIDatasetManager extends DatasetManager {
   }
   
   renameDataset() {
-    // Changes the name of the selected dataset
+    // Change the name of the selected dataset.
     if(this.selected_dataset) {
       const
           inp = this.rename_modal.element('name'),
           n = UI.cleanName(inp.value);
-      // Show modeler the "cleaned" new name
+      // Show modeler the "cleaned" new name.
       inp.value = n;
-      // Then try to rename -- this may generate a warning
+      // Then try to rename -- this may generate a warning.
       if(this.selected_dataset.rename(n)) {
         this.rename_modal.hide();
         if(EXPERIMENT_MANAGER.selected_experiment) {
@@ -670,59 +675,22 @@ class GUIDatasetManager extends DatasetManager {
         UI.updateControllerDialogs('CDEFJX');
       }
     } else if(this.selected_prefix_row) {
-      // Create a list of datasets to be renamed
+      // Create a list of datasets to be renamed.
       let e = this.rename_modal.element('name'),
           prefix = e.value.trim();
       e.focus();
-      // Trim trailing colon if user entered it
+      // Trim trailing colon if user added it.
       while(prefix.endsWith(':')) prefix = prefix.slice(0, -1);
-      // NOTE: prefix may be empty string, but otherwise should be a valid name
+      // NOTE: Prefix may be empty string, but otherwise should be a
+      // valid name.
       if(prefix && !UI.validName(prefix)) {
         UI.warn('Invalid prefix');
         return;
       }
-      // Now add the colon-plus-space prefix separator
+      // Now add the colon-plus-space prefix separator.
       prefix += UI.PREFIXER;
-      const
-          oldpref = this.selectedPrefix,
-          key = oldpref.toLowerCase().split(UI.PREFIXER).join(':_'),
-          newkey = prefix.toLowerCase().split(UI.PREFIXER).join(':_'),
-          dsl = [];
-      // No change if new prefix is identical to old prefix
-      if(oldpref !== prefix) { 
-        for(let k in MODEL.datasets) if(MODEL.datasets.hasOwnProperty(k)) {
-          if(k.startsWith(key)) dsl.push(k);
-        }
-        // NOTE: no check needed for mere upper/lower case changes
-        if(newkey !== key) {
-          let nc = 0;
-          for(let i = 0; i < dsl.length; i++) {
-            let nk = newkey + dsl[i].substring(key.length);
-            if(MODEL.datasets[nk]) nc++;
-          }
-          if(nc) {
-            UI.warn('Renaming ' + pluralS(dsl.length, 'dataset').toLowerCase() +
-                ' would cause ' + pluralS(nc, 'name conflict'));
-            return;
-          }
-        }
-        // Reset counts of effects of a rename operation
-        this.entity_count = 0;
-        this.expression_count = 0;
-        // Rename datasets one by one, suppressing notifications
-        for(let i = 0; i < dsl.length; i++) {
-          const d = MODEL.datasets[dsl[i]];
-          d.rename(d.displayName.replace(oldpref, prefix), false);
-        }
-        let msg = 'Renamed ' + pluralS(dsl.length, 'dataset').toLowerCase();
-        if(MODEL.variable_count) msg += ', and updated ' +
-            pluralS(MODEL.variable_count, 'variable') + ' in ' +
-            pluralS(MODEL.expression_count, 'expression');
-        UI.notify(msg);
-        if(EXPERIMENT_MANAGER.selected_experiment) {
-          EXPERIMENT_MANAGER.selected_experiment.inferVariables();
-        }
-        UI.updateControllerDialogs('CDEFJX');
+      // Perform the renaming operation.
+      if(MODEL.renamePrefixedDatasets(this.selectedPrefix, prefix)) {
         this.selectPrefixRow(prefix);
       }
     }