linny-r 1.1.13 → 1.1.14

package/package.json

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

package/static/linny-r.css

@@ -2168,8 +2168,8 @@ td.equation-expression {
 
 /* SERIES modal dialog */
 #series-dlg {
-  width: 156px;
-  height: 282px;
+  width: 165px;
+  height: 320px;
 }
 
 #series-default-lbl {
@@ -2182,7 +2182,7 @@ td.equation-expression {
   position: absolute;
   top: 24px;
   left: 79px;
-  width: 73px;
+  width: calc(100% - 83px);
   font-size: 12px;
   margin-bottom: 2px;
 }
@@ -2202,13 +2202,13 @@ td.equation-expression {
 #series-array {
   position: absolute;
   top: 45px;
-  left: 90px; 
+  left: 77px; 
 }
 
 #series-array-lbl {
   position: absolute;
   top: 47px;
-  left: 112px;  
+  left: 99px;  
 }
 
 #series-no-time-msg {
@@ -2216,7 +2216,7 @@ td.equation-expression {
   top: 66px;
   left: 1px;
   width: calc(100% - 2px);
-  height: 27px;
+  height: 30px;
   z-index: 1;
   background-color: inherit;
   font-style: italic;
@@ -2235,7 +2235,7 @@ td.equation-expression {
   position: absolute;
   top: 67px;
   left: 60px;
-  width: 43px;
+  width: 50px;
   font-size: 12px;
   margin-bottom: 2px;
 }
@@ -2243,7 +2243,7 @@ td.equation-expression {
 #series-time-unit {
   position: absolute;
   top: 67px;
-  left: 108px;
+  left: 116px;
   height: 19px;
   width: 45px;
   font-size: 12px;
@@ -2251,40 +2251,43 @@ td.equation-expression {
 
 #series-method-lbl {
   position: absolute;
-  top: 90px;
+  top: 91px;
   left: 2px;
 }
 
 #series-method {
   position: absolute;
-  top: 88px;
-  left: 49px;
-  height: 19px;
-  width: 105px;
-  font-size: 11px;
+  top: 89px;
+  left: 50px;
+  height: 21px;
+  width: 111px;
+  font-size: 12px;
 }
 
 #series-remote {
   position: absolute;
-  top: 110px;
-  left: 2px;  
+  top: 113px;
+  left: 3px;
+  width: calc(100% - 8px);
 }
 
 #series-url {
-  width: 150px;
+  width: 100%;
   font-size: 12px;
 }
 
 #series-data-lbl {
   position: absolute;
-  top: 129px;
+  top: 133px;
   left: 2px;
 }
 
 #series-data {
-  width: 150px;
-  height: 120px;
-  margin: 125px 3px;
+  position: absolute;
+  bottom: 13px;
+  width: calc(100% - 6px);
+  height: calc(100% - 165px);
+  margin: 3px;
 }
 
 #series-line {

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

@@ -140,7 +140,7 @@ class Controller {
         'scale_unit', 'equal_bounds', 'price', 'is_source', 'is_sink', 'is_buffer',
         'is_data', 'integer_level', 'no_slack'],
       DATASET_PROPS: ['comments', 'default_value', 'time_scale', 'time_unit',
-        'method', 'periodic', 'array', 'url'],
+        'method', 'periodic', 'array', 'url', 'default_selector'],
       LINK_PROPS: ['comments', 'multiplier', 'relative_rate', 'share_of_cost',
         'flow_delay'],
       CONSTRAINT_PROPS: ['comments', 'no_slack', 'share_of_cost'],

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

@@ -8833,7 +8833,7 @@ class GUIDatasetManager extends DatasetManager {
       if(d === sd) sdid += i;
       dl.push(['<tr id="dstr', i, '" class="dataset',
           (d === sd ? ' sel-set' : ''),
-          '" onclick="DATASET_MANAGER.selectDataset(\'',
+          '" onclick="DATASET_MANAGER.selectDataset(event, \'',
           dnl[i], '\');" onmouseover="DATASET_MANAGER.showInfo(\'', dnl[i],
           '\', event.shiftKey);"><td', cls, '>', d.displayName,
           '</td></tr>'].join(''));
@@ -8907,14 +8907,19 @@ class GUIDatasetManager extends DatasetManager {
     for(let i = 0; i < msl.length; i++) {
       const
           m = sd.modifiers[UI.nameToID(msl[i])],
-          clk = '" onclick="DATASET_MANAGER.selectModifier(\'' +
+          defsel = (m.selector === sd.default_selector),
+          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',
           (m.hasWildcards ? ' wildcard' : ''),
+          '" title="Shift-click to ', (defsel ? 'clear' : 'set as'),
+          ' default modifier',
           clk, ', false);">',
+          (defsel ? '<img src="images/solve.png" style="height: 14px;' +
+              ' width: 14px; margin: 0 1px -3px -1px;">' : ''),
           m.selector, '</td><td class="dataset-expression',
           clk, ');">', m.expression.text, '</td></tr>'].join(''));
     }
@@ -8961,46 +8966,54 @@ class GUIDatasetManager extends DatasetManager {
     this.updateDialog();
   }
   
-  selectDataset(id) {
-    // Select dataset, or edit it when double-clicked
+  selectDataset(event, id) {
+    // Select dataset, or edit it when Alt- or double-clicked
     const
-        d = MODEL.datasets[id],
+        d = MODEL.datasets[id] || null,
         now = Date.now(),
-        dt = now - this.last_time_selected;
+        dt = now - this.last_time_selected,
+        // Consider click to be "double" if it occurred less than 300 ms ago
+        edit = event.altKey || (d === this.selected_dataset && dt < 300);
+    this.selected_dataset = d;
     this.last_time_selected = now;
-    if(d === this.selected_dataset) {
-      // Consider click to be "double" if it occurred less than 300 ms ago
-      if(dt < 300) {
-        this.last_time_selected = 0;
-        this.editData();
-        return;
-      }
+    if(d && edit) {
+      this.last_time_selected = 0;
+      this.editData();
+      return;
     }
-    this.selected_dataset = MODEL.datasets[id];
     this.updateDialog();
   }
   
-  selectModifier(id, x=true) {
+  selectModifier(event, id, x=true) {
     // Select modifier, or when double-clicked, edit its expression or the
     // name of the modifier
     if(this.selected_dataset) {
       const m = this.selected_dataset.modifiers[UI.nameToID(id)],
             now = Date.now(),
-            dt = now - this.last_time_selected;
+            dt = now - this.last_time_selected,
+            // NOTE: Alt-click and double-click indicate: edit
+            // Consider click to be "double" if the same modifier was clicked
+            // less than 300 ms ago
+            edit = event.altKey || (m === this.selected_modifier && dt < 300);
       this.last_time_selected = now;
-      if(m === this.selected_modifier) {
-        // Consider click to be "double" if it occurred less than 300 ms ago
-        if(dt < 300) {
-          this.last_time_selected = 0;
-          if(x) {
-            this.editExpression();
-          } else {
-            this.promptForSelector('rename');
-          }
-          return;
+      if(event.shiftKey) {
+        // Toggle dataset default selector
+        if(m.selector === this.selected_dataset.default_selector) {
+          this.selected_dataset.default_selector = '';
+        } else {
+          this.selected_dataset.default_selector = m.selector;
         }
       }
       this.selected_modifier = m;
+      if(edit) {
+        this.last_time_selected = 0;
+        if(x) {
+          this.editExpression();
+        } else {
+          this.promptForSelector('rename');
+        }
+        return;
+      }
     } else {
       this.selected_modifier = null;
     }
@@ -9167,6 +9180,10 @@ class GUIDatasetManager extends DatasetManager {
         m = this.selected_dataset.addModifier(sel);
     // NULL can result when new name is invalid
     if(!m) return;
+    // If selected modifier was the dataset default selector, update it
+    if(oldm.selector === this.selected_dataset.default_selector) {
+      this.selected_dataset.default_selector = m.selector;
+    }
     // If only case has changed, just update the selector
     // NOTE: normal dataset selector, so remove all invalid characters
     if(m === oldm) {
@@ -9248,8 +9265,14 @@ class GUIDatasetManager extends DatasetManager {
   }
 
   deleteModifier() {
+    // Delete modifier from selected dataset
     const m = this.selected_modifier;
     if(m) {
+      // If it was the dataset default modifier, clear the default
+      if(m.selector === this.selected_dataset.default_selector) {
+        this.selected_dataset.default_selector = '';
+      }
+      // Then simply remove the object
       delete this.selected_dataset.modifiers[UI.nameToID(m.selector)];
       this.selected_modifier = null;
       this.updateModifiers();
@@ -9418,7 +9441,7 @@ class EquationManager {
       const
           m = ed.modifiers[UI.nameToID(msl[i])],
           mp = (m.parameters ? '\\' + m.parameters.join('\\') : ''),
-          clk = '" onclick="EQUATION_MANAGER.selectModifier(\'' +
+          clk = '" onclick="EQUATION_MANAGER.selectModifier(event, \'' +
               m.selector + '\'';
       if(m === sm) smid += i;
       ml.push(['<tr id="eqmtr', i, '" class="dataset-modif',
@@ -9444,28 +9467,27 @@ class EquationManager {
     // @@TO DO: Display documentation for the equation => extra comments field?
   }
   
-  selectModifier(id, x=true) {
-    // Select modifier, or when double-clicked, edit its expression or the
-    // name of the modifier
+  selectModifier(event, id, x=true) {
+    // Select modifier, or when Alt- or double-clicked, edit its expression
+    // or the equation name (= name of the modifier)
     if(MODEL.equations_dataset) {
       const
-          m = MODEL.equations_dataset.modifiers[UI.nameToID(id)],
+          m = MODEL.equations_dataset.modifiers[UI.nameToID(id)] || null,
           now = Date.now(),
-          dt = now - this.last_time_selected;
+          dt = now - this.last_time_selected,
+          // Consider click to be "double" if it occurred less than 300 ms ago
+          edit = event.altKey || (m === this.selected_modifier && dt < 300);
       this.last_time_selected = now;
-      if(m === this.selected_modifier) {
-        // Consider click to be "double" if it occurred less than 300 ms ago
-        if(dt < 300) {
-          this.last_time_selected = 0;
-          if(x) {
-            this.editEquation();
-          } else {
-            this.promptForName();
-          }
-          return;
+      this.selected_modifier = m;
+      if(m && edit) {
+        this.last_time_selected = 0;
+        if(x) {
+          this.editEquation();
+        } else {
+          this.promptForName();
         }
+        return;
       }
-      this.selected_modifier = m;
     } else {
       this.selected_modifier = null;
     }

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

@@ -6301,6 +6301,37 @@ class Node extends NodeBox {
     }
     return cac;
   }
+  
+  convertLegacyBoundData(lb_data, ub_data) {
+    // Convert time series data for LB and UB in legacy models to datasets,
+    // and replace attribute expressions by references to these datasets
+    if(!lb_data && !ub_data) return;
+    const same = lb_data === ub_data;
+    if(lb_data) {
+      const
+          dsn = this.displayName + (same ? '' : ' LOWER') + ' BOUND DATA',
+          ds = MODEL.addDataset(dsn);
+      // Use the LB attribute as default value for the dataset
+      ds.default_value = parseFloat(this.lower_bound.text);
+      ds.data = stringToFloatArray(lb_data);
+      ds.computeVector();
+      ds.computeStatistics();
+      this.lower_bound.text = `[${dsn}]`;
+      if(same) this.equal_bounds = true;
+      MODEL.legacy_datasets = true;
+    }
+    if(ub_data && !same) {
+      const
+          dsn = this.displayName + ' UPPER BOUND DATA',
+          ds = MODEL.addDataset(dsn);
+      ds.default_value = parseFloat(this.upper_bound.text);
+      ds.data = stringToFloatArray(ub_data);
+      ds.computeVector();
+      ds.computeStatistics();
+      this.upper_bound.text = `[${dsn}]`;
+      MODEL.legacy_datasets = true;
+    }
+  }
 
   actualLevel(t) {
     // Returns the production level c.q. stock level for this node in time step t
@@ -6459,6 +6490,13 @@ class Process extends Node {
     this.comments = xmlDecoded(nodeContentByTag(node, 'notes'));
     this.lower_bound.text = xmlDecoded(nodeContentByTag(node, 'lower-bound'));
     this.upper_bound.text = xmlDecoded(nodeContentByTag(node, 'upper-bound'));
+    // legacy models can have LB and UB hexadecimal data strings
+    this.convertLegacyBoundData(nodeContentByTag(node, 'lower-bound-data'),
+        nodeContentByTag(node, 'upper-bound-data'));
+    if(nodeParameterValue(node, 'reversible') === '1') {
+      // For legacy "reversible" processes, the LB is set to -UB 
+      this.lower_bound.text = '-' + this.upper_bound.text;
+    }
     // NOTE: legacy models have no initial level field => default to 0 
     const ilt = xmlDecoded(nodeContentByTag(node, 'initial-level'));
     this.initial_level.text = ilt || '0';
@@ -6871,47 +6909,25 @@ class Product extends Node {
     this.equal_bounds = nodeParameterValue(node, 'equal-bounds') === '1';
     this.integer_level = nodeParameterValue(node, 'integer-level') === '1';
     this.no_slack = nodeParameterValue(node, 'no-slack') === '1';
-    // legacy models have tag "hidden" instead of "no-links"
+    // Legacy models have tag "hidden" instead of "no-links"
     this.no_links = (nodeParameterValue(node, 'no-links') ||
         nodeParameterValue(node, 'hidden')) === '1';
     this.scale_unit = MODEL.addScaleUnit(
         xmlDecoded(nodeContentByTag(node, 'unit')));
-    // legacy models have tag "profit" instead of "price"
+    // Legacy models have tag "profit" instead of "price"
     let pp = nodeContentByTag(node, 'price');
     if(!pp) pp = nodeContentByTag(node, 'profit');
     this.price.text = xmlDecoded(pp);
+    // Legacy models can have price time series data as hexadecimal string
+    this.convertLegacyPriceData(nodeContentByTag(node, 'profit-data'));
     this.lower_bound.text = xmlDecoded(nodeContentByTag(node, 'lower-bound'));
     this.upper_bound.text = xmlDecoded(nodeContentByTag(node, 'upper-bound'));
     // legacy models can have LB and UB hexadecimal data strings
-    const
-        lb_data = nodeContentByTag(node, 'lower-bound-data'),
-        ub_data = nodeContentByTag(node, 'upper-bound-data'),
-        same = lb_data === ub_data;
-    if(lb_data) {
-      const
-          dsn = this.displayName + (same ? '' : ' LOWER') + ' BOUND DATA',
-          ds = MODEL.addDataset(dsn);
-      ds.default_value = parseFloat(this.lower_bound.text);
-      ds.data = stringToFloatArray(lb_data);
-      ds.computeVector();
-      ds.computeStatistics();
-      this.lower_bound.text = `[${dsn}]`;
-      if(same) this.equal_bounds = true;
-      MODEL.legacy_datasets = true;
-    }
-    if(ub_data && !same) {
-      const
-          dsn = this.displayName + ' UPPER BOUND DATA',
-          ds = MODEL.addDataset(dsn);
-      ds.default_value = parseFloat(this.upper_bound.text);
-      ds.data = stringToFloatArray(ub_data);
-      ds.computeVector();
-      ds.computeStatistics();
-      this.upper_bound.text = `[${dsn}]`;
-      MODEL.legacy_datasets = true;
-    }
-    this.initial_level.text = xmlDecoded(
-        nodeContentByTag(node, 'initial-level'));
+    this.convertLegacyBoundData(nodeContentByTag(node, 'lower-bound-data'),
+        nodeContentByTag(node, 'upper-bound-data'));
+    // NOTE: legacy models have no initial level field => default to 0 
+    const ilt = xmlDecoded(nodeContentByTag(node, 'initial-level'));
+    this.initial_level.text = ilt || '0';
     this.comments = xmlDecoded(nodeContentByTag(node, 'notes'));
     this.x = safeStrToInt(nodeContentByTag(node, 'x-coord'));
     this.y = safeStrToInt(nodeContentByTag(node, 'y-coord'));
@@ -6927,6 +6943,23 @@ class Product extends Node {
     this.resize();
   }
 
+  convertLegacyPriceData(data) {
+    // Convert time series data for prices in legacy models to a dataset,
+    // and replace the price expression by a reference to this dataset
+    if(data) {
+      const
+          dsn = this.displayName + ' PRICE DATA',
+          ds = MODEL.addDataset(dsn);
+      // Use the price attribute as default value for the dataset
+      ds.default_value = parseFloat(this.price.text);
+      ds.data = stringToFloatArray(data);
+      ds.computeVector();
+      ds.computeStatistics();
+      this.price.text = `[${dsn}]`;
+      MODEL.legacy_datasets = true;
+    }
+  }
+
   get defaultAttribute() {
     return 'L';
   }
@@ -7396,6 +7429,8 @@ class Dataset {
     // *model* time step t = 0
     this.vector = [];
     this.modifiers = {};
+    // Selector to be used when model is run normally, i.e., no experiment
+    this.default_selector = '';
   }
 
   get type() {
@@ -7781,7 +7816,8 @@ class Dataset {
         '</method><url>', xmlEncoded(this.url),
         '</url><data>', xmlEncoded(this.dataString),
         '</data><modifiers>', ml.join(''),
-        '</modifiers></dataset>'].join('');
+        '</modifiers><default-selector>', xmlEncoded(this.default_selector),
+        '</default-selector></dataset>'].join('');
     return xml;
   }
 
@@ -7812,6 +7848,12 @@ class Dataset {
         }
       }
     }
+    const ds = xmlDecoded(nodeContentByTag(node, 'default-selector'));
+    if(ds && !this.modifiers[ds]) {
+      UI.warn(`Dataset <tt>${this.name}</tt> has no selector <tt>${ds}</tt>`);
+    } else {
+      this.default_selector = ds;      
+    }
   }
   
   rename(name) {

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

@@ -564,7 +564,9 @@ function hexToFloat(s) {
   const
       sign = (n >> 31 ? -1 : 1),
       exp = Math.pow(2, ((n >> 23) & 0xFF) - 127);
-  return sign * (n & 0x7fffff | 0x800000) * 1.0 / Math.pow(2, 23) * exp;
+      f = sign * (n & 0x7fffff | 0x800000) * 1.0 / Math.pow(2, 23) * exp;
+  // NOTE: must consider precision of 32-bit floating point numbers!
+  return parseFloat(f.toPrecision(7));
 }
 
 function stringToFloatArray(s) {

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

@@ -714,8 +714,11 @@ class ExpressionParser {
         return [x, anchor1, offset1, anchor2, offset2];
       }
     }
+    
+    //
     // NOTE: for experiment results, the method will ALWAYS have returned
     // a result, so what follows does not apply to experiment results
+    //
     
     // Attribute name (optional) follows object-attribute separator
     s = name.split(UI.OA_SEPARATOR);
@@ -725,7 +728,7 @@ class ExpressionParser {
       // ... so restore name if itself contains other vertical bars
       name = s.join(UI.OA_SEPARATOR).trim();
       if(!attr) {
-        // Explicit empty attribute, e.g., [name|]
+        // Explicit *empty* attribute, e.g., [name|]
         // NOTE: this matters for datasets having specifiers: the vertical
         // bar indicates "do not infer a modifier from a running experiment,
         // but use the data"
@@ -817,8 +820,12 @@ class ExpressionParser {
           (attr ? ' and have attribute ' + attr : '');
       return false;
     }
+    
+    //
     // NOTE: for statistics, the method will ALWAYS have returned a result,
     // so what follows does not apply to statistics results
+    //
+    
     let by_reference = false;
     if(name === '.') {
       // NOTE: when name is a single dot, it refers to the data of a dataset
@@ -5227,15 +5234,26 @@ function VMI_push_dataset_modifier(x, args) {
         MODEL.end_period - MODEL.start_period + MODEL.look_ahead + 1, t));
   }
   if(ms) {
-    // If modifier selector is specified, use the associated expression ...
+    // If modifier selector is specified, use the associated expression
     obj = mx;
-    // ... else check whether an experiment is running UNLESS "use data" is TRUE
-  } else if(MODEL.running_experiment && !ud) {
-    // If so, check if dataset modifiers match the combination of selectors
-    // for the active run
-    const mm = ds.matchingModifiers(MODEL.running_experiment.activeCombination);
-    // If so, use the first match
-    if(mm.length > 0) obj = mm[0].expression;
+  } else if(!ud) {
+    if(MODEL.running_experiment) {
+      // If an experiment is running, check if dataset modifiers match the
+      // combination of selectors for the active run
+      const mm = ds.matchingModifiers(MODEL.running_experiment.activeCombination);
+      // If so, use the first match
+      if(mm.length > 0) obj = mm[0].expression;
+    } else if(ds.default_selector) {
+      // If no expriment (so "normal" run), use default selector if specified
+      const dm = ds.modifiers[ds.default_selector];
+      if(dm) {
+        obj = dm.expression;
+      } else {
+        // Exception should never occur, but check anyway and log it 
+        console.log('WARNING: Dataset "' + ds.name +
+            `" has no default selector "${ds.default_selector}"`);
+      }
+    }
   }
   // By default, use the dataset default value
   let v = ds.defaultValue,