linny-r 1.6.0 → 1.6.2

package/package.json

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

package/server.js

@@ -1521,7 +1521,7 @@ function connectionErrorText(msg) {
 //
 
 function commandLineSettings() {
-  // Sets default settings, and then checks the command line arguments
+  // Sets default settings, and then checks the command line arguments.
   const settings = {
       cli_name: (PLATFORM.startsWith('win') ? 'Command Prompt' : 'Terminal'),
       inkscape: '',
@@ -1533,6 +1533,22 @@ function commandLineSettings() {
       solver_path: '',
       user_dir: path.join(WORKING_DIRECTORY, 'user')
     };
+  const
+      cmd = process.argv[0],
+      app = (cmd.endsWith('node.exe') ? 'node' : 'linny-r'),
+      usage = `Usage:  ${app} server [options]
+
+Possible options are:
+  dpi=[number]       will make InkScape render SVGs in the specified resolution
+  help               will display these command line options
+  launch             will open the Linny-R GUI in a browser window
+  port=[number]      will listen at the specified port number
+                     (default is 5050; number must be unique for each server)
+  solver=[name]      will select solver [name], or warn if not found
+                     (name choices: Gurobi, CPLEX, SCIP or LP_solve)
+  verbose            will output solver messages to the console
+  workspace=[path]   will create workspace in [path] instead of (Linny-R)/user
+`;
   for(let i = 2; i < process.argv.length; i++) {
     const lca = process.argv[i].toLowerCase();
     if(lca === 'launch') {
@@ -1541,7 +1557,7 @@ function commandLineSettings() {
       const av = lca.split('=');
       if(av.length === 1) av.push('');
       if(av[0] === 'port') {
-        // Accept any number greater than or equal to 1024
+        // Accept any number greater than or equal to 1024.
         const n = parseInt(av[1]);
         if(isNaN(n) || n < 1024) {
           console.log(`WARNING: Invalid port number ${av[1]}`);
@@ -1555,7 +1571,7 @@ function commandLineSettings() {
           settings.preferred_solver = av[1];
         }
       } else if(av[0] === 'dpi') {
-        // Accept any number greater than or equal to 1024
+        // Accept any number greater than or equal to 1024.
         const n = parseInt(av[1]);
         if(isNaN(n) || n > 1200) {
           console.log(`WARNING: Invalid resolution ${av[1]} (max. 1200 dpi)`);
@@ -1563,7 +1579,7 @@ function commandLineSettings() {
           settings.dpi = n;
         }
       } else if(av[0] === 'workspace') {
-        // User directory must be READ/WRITE-accessible
+        // User directory must be READ/WRITE-accessible.
         try {
           fs.accessSync(av[1], fs.constants.R_OK | fs.constants.W_O);
         } catch(err) {
@@ -1571,10 +1587,15 @@ function commandLineSettings() {
           process.exit();
         }
         settings.user_dir = av[1];
+      } else if(av[0] === 'help') {
+        // Print command line options.
+        console.log(usage);
+        process.exit();
       } else {
-        // Terminate script
+        // Terminate script.
         console.log(
-            `ERROR: Invalid command line argument "${process.argv[i]}"`);
+            `ERROR: Invalid command line argument "${process.argv[i]}"\n`);
+        console.log(usage);
         process.exit();
       }
     }

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

@@ -2935,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();
@@ -2956,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);
@@ -2967,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 || '';
@@ -3000,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]],
@@ -3012,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) {
@@ -3036,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, {}),
@@ -3071,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);
@@ -3095,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')),
@@ -3134,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);
@@ -3150,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]);
@@ -3174,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})`;
       }
@@ -3191,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;
@@ -3217,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),
@@ -3282,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++) {
@@ -3307,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 = {},
@@ -3323,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;
@@ -3334,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) {
@@ -3353,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-documentation-manager.js

@@ -338,7 +338,7 @@ class DocumentationManager {
         this.viewer.innerHTML = this.markdown;
         this.edit_btn.classList.remove('disab');
         this.edit_btn.classList.add('enab');
-        // NOTE: permit documentation of the model by raising the dialog
+        // NOTE: Permit documentation of the model by raising the dialog.
         if(this.entity === MODEL) this.dialog.style.zIndex = 101;
       } else if(e instanceof DatasetModifier) {
         this.title.innerHTML = e.selector;
@@ -347,17 +347,17 @@ class DocumentationManager {
         if(e.expression.eligible_prefixes) {
           const el = Object.keys(e.expression.eligible_prefixes)
               .sort(compareSelectors);
-          if(el.length > 0) this.viewer.innerHTML = 'Method <tt>' +
-              e.selector + '</tt> applies to ' +
-              pluralS(el.length, 'prefixed entity group').toLowerCase() +
-              ':<ul><li>' + el.join('</li><li>') + '</li></ul>';
+          if(el.length > 0) this.viewer.innerHTML = [
+              'Method <tt>', e.selector, '</tt> applies to ',
+              pluralS(el.length, 'prefixed entity group'),
+              ':<ul><li>', el.join('</li><li>'), '</li></ul>'].join('');
         }
       }
     }
   }
   
   rewrite(str) {
-    // Apply all the rewriting rules to `str`
+    // Apply all the rewriting rules to `str`.
     str = '\n' + str + '\n';
     this.rules.forEach(
         (rule) => { str = str.replace(rule.pattern, rule.rewrite); });
@@ -365,28 +365,29 @@ class DocumentationManager {
   }
   
   makeList(par, isp, type) {
-    // Split on the *global multi-line* item separator pattern
+    // Split on the *global multi-line* item separator pattern.
     const splitter = new RegExp(isp, 'gm'),
           list = par.split(splitter);
     if(list.length < 2) return false;
-    // Now we know that the paragraph contains at least one list item line
+    // Now we know that the paragraph contains at least one list item line.
     let start = 0;
-    // Paragraph may start with plain text, so check using the original pattern
+    // Paragraph may start with plain text, so check using the original
+    // pattern.
     if(!par.match(isp)) {
       // If so, retain this first part as a separate paragraph...
       start = 1;
-      // NOTE: add it only if it contains text
+      // NOTE: Add it only if it contains text.
       par = (list[0].trim() ? `<p>${this.rewrite(list[0])}</p>` : '');
-      // ... and clear it as list item
+      // ... and clear it as list item.
       list[0] = '';
     } else {
       par = '';
     }
-    // Rewrite each list item fragment that contains text 
+    // Rewrite each list item fragment that contains text.
     for(let j = start; j < list.length; j++) {
       list[j] = (list[j].trim() ? `<li>${this.rewrite(list[j])}</li>` : '');
     }
-    // Return assembled parts
+    // Return assembled parts.
     return [par, '<', type, 'l>', list.join(''), '</', type, 'l>'].join('');
   }
   
@@ -395,16 +396,16 @@ class DocumentationManager {
     const html = this.markup.split(/\n{2,}/);
     let list;
     for(let i = 0; i < html.length; i++) {
-      // Paragraph with only dashes and spaces becomes a horizontal rule 
+      // Paragraph with only dashes and spaces becomes a horizontal rule.
       if(html[i].match(/^( *-)+$/)) {
         html[i] = '<hr>';
-      // Paragraph may contain a bulleted list 
+      // Paragraph may contain a bulleted list.
       } else if ((list = this.makeList(html[i], /^ *- +/, 'u')) !== false) {
         html[i] = list;
-      // Paragraph may contain a numbered list 
+      // Paragraph may contain a numbered list.
       } else if ((list = this.makeList(html[i], /^ *\d+. +/, 'o')) !== false) {
         html[i] = list;
-      // Otherwise: default HTML paragraph
+      // Otherwise: default HTML paragraph.
       } else {
         html[i] = `<p>${this.rewrite(html[i])}</p>`;
       }
@@ -431,7 +432,7 @@ class DocumentationManager {
   }
   
   insertSymbol(sym) {
-    // Insert symbol (clicked item in list below text area) into text area 
+    // Insert symbol (clicked item in list below text area) into text area.
     this.editor.focus();
     let p = this.editor.selectionStart;
     const
@@ -454,7 +455,7 @@ class DocumentationManager {
       } else if(this.entity instanceof Constraint) {
         UI.paper.drawConstraint(this.entity);
       } else if (typeof this.entity.draw === 'function') {
-        // Only draw if the entity responds to that method
+        // Only draw if the entity responds to that method.
         this.entity.draw();
       }
     }
@@ -501,14 +502,14 @@ class DocumentationManager {
   }
 
   addMessage(msg) {
-    // Append message to the info messages list
+    // Append message to the info messages list.
     if(msg) this.info_messages.push(msg);
-    // Update dialog only when it is showing
+    // Update dialog only when it is showing.
     if(!UI.hidden(this.dialog.id)) this.showInfoMessages(true);
   }
   
   showInfoMessages(shift) {
-    // Show all messages that have appeared on the status line
+    // Show all messages that have appeared on the status line.
     const 
         n = this.info_messages.length,
         title = pluralS(n, 'message') + ' since the current model was loaded';
@@ -524,21 +525,21 @@ class DocumentationManager {
             '<div class="', m.status, first, '-msg">', m.text, '</div></div>');
       }
       this.viewer.innerHTML = divs.join('');
-      // Set the dialog title
+      // Set the dialog title.
       this.title.innerHTML = title;
     }
   }
 
   showArrowLinks(arrow) {
-    // Show list of links represented by a composite arrow
+    // Show list of links represented by a composite arrow.
     const
         n = arrow.links.length,
         msg = 'Arrow represents ' + pluralS(n, 'link');
     UI.setMessage(msg);
     if(this.visible && !this.editing) {
-      // Set the dialog title
+      // Set the dialog title.
       this.title.innerHTML = msg;
-      // Show list
+      // Show list.
       const lis = [];
       let l, dn, c, af;
       for(let i = 0; i < n; i++) {
@@ -570,7 +571,8 @@ class DocumentationManager {
   }
 
   showHiddenIO(node, arrow) {
-    // Show list of products or processes linked to node by an invisible arrow
+    // Show list of products or processes linked to node by an invisible
+    // arrow (i.e., links represented by a block arrow).
     let msg, iol;
     if(arrow === UI.BLOCK_IN) {
       iol = node.hidden_inputs;
@@ -586,9 +588,9 @@ class DocumentationManager {
     UI.on_block_arrow = true;
     UI.setMessage(msg);
     if(this.visible && !this.editing) {
-      // Set the dialog title
+      // Set the dialog title.
       this.title.innerHTML = msg;
-      // Show list
+      // Show list.
       const lis = [];
       for(let i = 0; i < iol.length; i++) {
         lis.push(`<li>${iol[i].displayName}</li>`);
@@ -599,17 +601,19 @@ class DocumentationManager {
   }
 
   showAllDocumentation() {
+    // Show (as HTML) all model entities (categorized by type) with their
+    // associated comments (if added by the modeler).
     const
         html = [],
         sl = MODEL.listOfAllComments;
     for(let i = 0; i < sl.length; i++) {
       if(sl[i].startsWith('_____')) {
-        // 5-underscore leader indicates: start of new category
+        // 5-underscore leader indicates: start of new category.
         html.push('<h2>', sl[i].substring(5), '</h2>');
       } else {
         // Expect model element name...
         html.push('<p><tt>', sl[i], '</tt><br><small>');
-        // ... immediately followed by its associated marked-up comments
+        // ... immediately followed by its associated marked-up comments.
         i++;
         this.markup = sl[i];
         html.push(this.markdown, '</small></p>');
@@ -617,7 +621,7 @@ class DocumentationManager {
     }
     this.title.innerHTML = 'Complete model documentation';
     this.viewer.innerHTML = html.join('');
-    // Deselect entity and disable editing
+    // Deselect entity and disable editing.
     this.entity = null;
     this.edit_btn.classList.remove('enab');
     this.edit_btn.classList.add('disab');

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

@@ -151,7 +151,7 @@ class EquationManager {
           (m === sm ? ' sel-set' : ''),
           '"><td class="equation-selector',
           (method ? ' method' : ''),
-          // Display in gray when method cannot be applied
+          // Display in gray when method cannot be applied.
           (m.expression.noMethodObject ? ' no-object' : ''),
           (m.expression.isStatic ? '' : ' it'), issue,
           (wild ? ' wildcard' : ''), clk, ', false);"', mover, '>',
@@ -268,20 +268,23 @@ class EquationManager {
     if(!this.selected_modifier) return;
     const
         sel = this.rename_modal.element('name').value,
-        // Keep track of old name
+        // Keep track of old name.
         oldm = this.selected_modifier,
         olds = oldm.selector,
-        // NOTE: addModifier returns existing one if selector not changed
+        // NOTE: addModifier returns existing one if selector not changed.
         m = MODEL.equations_dataset.addModifier(sel);
-    // NULL indicates invalid name
+    // NULL indicates invalid name.
     if(!m) return;
-    // If only case has changed, update the selector
-    // NOTE: equation names may contain spaces; if so, reduce to single space
+    // If only case has changed, update the selector.
+    // NOTE: Equation names may contain spaces; if so, reduce to single space.
     if(m === oldm) {
       m.selector = sel.trim().replace(/\s+/g, ' ');
     } else {
-      // When a new modifier has been added, more actions are needed
+      // When a new modifier has been added, more actions are needed.
       m.expression = oldm.expression;
+      // NOTE: The `attribute` property of the expression must be updated
+      // because it identifies the "owner" of the expression.
+      m.expression.attribute = m.selector;
       this.deleteEquation();
       this.selected_modifier = m;
     }

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

@@ -356,7 +356,11 @@ class GUIExperimentManager extends ExperimentManager {
     dim_count.innerHTML = pluralS(x.available_dimensions.length,
         'more dimension');
     x.inferActualDimensions();
+    for(let i = 0; i < x.actual_dimensions.length; i++) {
+      x.actual_dimensions[i].sort(compareSelectors);
+    }
     x.inferCombinations();
+    //x.combinations.sort(compareCombinations);
     combi_count.innerHTML = pluralS(x.combinations.length, 'combination');
     if(x.combinations.length === 0) canview = false;
     header.innerHTML = x.title;
@@ -850,6 +854,9 @@ class GUIExperimentManager extends ExperimentManager {
       }
       // Get the selected statistic for each run so as to get an array of numbers
       const data = [];
+      // Set reference column indices so that values for the reference|
+      // configuration can be displayed in orange.
+      const ref_conf_indices = [];
       for(let i = 0; i < x.runs.length; i++) {
         const
             r = x.runs[i],
@@ -878,7 +885,7 @@ class GUIExperimentManager extends ExperimentManager {
           data.push(rr.last);
         }
       }
-      // Scale data as selected
+      // Scale data as selected.
       const scaled = data.slice();
       // NOTE: scale only after the experiment has been completed AND
       // configurations have been defined (otherwise comparison is pointless)
@@ -896,7 +903,9 @@ class GUIExperimentManager extends ExperimentManager {
           }
           // Set difference for reference configuration itself to 0
           for(let i = 0; i < n; i++) {
-            scaled[rc * n + i] = 0;
+            const index = rc * n + i;
+            scaled[index] = 0;
+            ref_conf_indices.push(index);
           }
         } else if(x.selected_scale === 'reg') {
           // Compute regret: current config - high value config in same scenario
@@ -934,13 +943,15 @@ class GUIExperimentManager extends ExperimentManager {
         formatted.push(VM.sig4Dig(scaled[i]));
       }
       uniformDecimals(formatted);
-      // Display formatted data in cells
+      // Display formatted data in cells.
       for(let i = 0; i < x.combinations.length; i++) {
         const cell = document.getElementById('xr' + i);
         if(i < x.runs.length) {
           cell.innerHTML = formatted[i];
           cell.classList.remove('not-run');
           cell.style.backgroundColor = this.color_scale.rgb(normalized[i]);
+          cell.style.color = (ref_conf_indices.indexOf(i) >= 0 ?
+              'orange' : 'black');
           const
               r = x.runs[i],
               rr = r.results[rri],

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

@@ -441,6 +441,7 @@ class Finder {
       }
     }
     document.getElementById('finder-item-header').innerHTML = hdr;
+    occ.sort(compareSelectors);
     for(let i = 0; i < occ.length; i++) {
       const e = MODEL.objectByID(occ[i]);
       el.push(['<tr id="eotr', i, '" class="dataset" onclick="FINDER.reveal(\'',