linny-r 1.1.23 → 1.2.0

package/static/linny-r.css

@@ -747,6 +747,52 @@ img.inline-cancel-btn {
   cursor: pointer;
 }
 
+/* styles for the NEW SCALAR dialog */
+#new-scale-unit-modal {
+  z-index: 115; /* on top of the SCALARS modal */
+}
+
+#new-scale-unit-dlg {
+  width: min-content;
+  height: min-content;
+  max-height: 450px;
+}
+
+#new-scale-unit-name {
+  width: 70px;
+}
+
+#new-scale-unit-scalar {
+  width: 115px;
+}
+
+#new-scale-unit-base {
+  width: 70px;
+}
+
+/* styles for the SCALE UNITS dialog */
+#scale-units-modal {
+  z-index: 110; /* on top of the SETTINGS dialog */
+}
+
+#scale-units-dlg {
+  width: 270px;
+  height: min-content;
+  max-height: 450px;
+}
+
+#scale-units-buttons > img.btn {
+  height: 20px;
+  width: 20px;
+}
+
+#scale-units-scroll-area {
+  margin: 2px;
+  width: calc(100% - 4px);
+  max-height: 250px;
+  overflow-y: auto;
+  border-top: 1px solid Silver;
+}
 
 /* styles for the MODEL SETTINGS dialog */
 #settings-dlg {
@@ -754,6 +800,18 @@ img.inline-cancel-btn {
   height: min-content;
 }
 
+#settings-scale-units-btn {
+  margin-left: 0px;
+  margin-right: 7px;
+  margin-top: -3px;
+  cursor: pointer;
+  filter: brightness(85%);
+}
+
+#settings-scale-units-btn:hover {
+  filter: brightness(200%);
+}
+
 #password-dlg {
   width: min-content;
   height: min-content;
@@ -958,6 +1016,7 @@ td.a-box > div.abox {
 
 td.a-name {
   width: 208px;
+  max-width: 208px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -966,6 +1025,7 @@ td.a-name {
 
 td.a-weight {
   width: 124px;
+  max-width: 124px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -1546,7 +1606,7 @@ td.export {
 }
 
 #expression-dlg {
-  width: 545px;
+  width: 550px;
   height: 325px;
 }
 
@@ -1864,6 +1924,10 @@ td.it {
   font-style: italic;
 }
 
+td.series {
+  
+}
+
 td.io {
   width: 12px;
 }
@@ -1905,6 +1969,7 @@ div.io-box {
   border-top: 1px solid Silver;
 }
 
+#scale-units-table,
 #dataset-table,
 #dataset-modif-table,
 #equation-table,
@@ -2025,24 +2090,91 @@ tr.sel-set {
   background-color: #eff0ff;  
 }
 
-td.outcome:before {
+tr.def-sel {
+  color: #400090;
+  font-weight: bold;
+}
+
+td.modif::before {
+  content: ' \2045';
+  color: #b00080;
+  margin-right: 2px;
+}
+
+td.outcome::before {
   content: ' \25C8';
+  color: #b00080;
+  margin-right: 1px;
 }
 
-td.array:before {
-  content: ' \2637';
+td.array::before {
+  content: ' \2263';
+  color: #b00080;
+  margin-right: 1px;
 }
 
-td.blackbox:before {
+td.series::before {
+  content: ' \28B8';
+  color: #b00080;
+  margin-left: -1px;
+}
+
+td.outcome.modif::before {
+  content: ' \25C8\2045';
+  color: #b00080;
+  margin-right: 2px;
+}
+
+td.array.modif::before {
+  content: ' \2263\2045';
+  color: #b00080;
+  margin-right: 1px;
+}
+
+td.series.modif::before {
+  content: ' \28B8\2045';
+  color: #b00080;
+  margin-left: -1px;
+}
+
+td.blackbox::before {
   content: ' \25FC';
+  color: #b00080;
+}
+
+td.blackbox.series::before {
+  content: ' \25FC\28B8';
+  color: #b00080;
 }
 
-td.blackbox.array:before {
-  content: ' \25FC\2637';
+td.blackbox.array::before {
+  content: ' \25FC\2263';
+  color: #b00080;
 }
 
-td.blackbox.outcome:before {
+td.blackbox.outcome::before {
   content: ' \25FC\25C8';
+  color: #b00080;
+}
+
+td.blackbox.modif::before {
+  content: ' \25FC\2045';
+  color: #b00080;
+}
+
+td.blackbox.series.modif::before {
+  content: ' \25FC\28B8\2045';
+  color: #b00080;
+}
+
+td.blackbox.array.modif::before {
+  content: ' \25FC\2263\2045';
+  color: #b00080;
+}
+
+td.blackbox.outcome.modif::before {
+  content: ' \25FC\25C8\2045';
+  color: #b00080;
 }
 
 td.dataset-selector {
@@ -2169,7 +2301,7 @@ td.equation-expression {
 /* SERIES modal dialog */
 #series-dlg {
   width: 165px;
-  height: 320px;
+  height: 341px;
 }
 
 #series-default-lbl {
@@ -2184,36 +2316,49 @@ td.equation-expression {
   left: 79px;
   width: calc(100% - 83px);
   font-size: 12px;
-  margin-bottom: 2px;
+}
+
+#series-unit-lbl {
+  position: absolute;
+  top: 47px;
+  left: 2px;
+}
+
+#series-unit {
+  position: absolute;
+  top: 46px;
+  left: 32px;
+  width: 70px;
+  font-size: 12px;
 }
 
 #series-periodic {
   position: absolute;
-  top: 45px;
+  top: 66px;
   left: 0px;  
 }
 
 #series-periodic-lbl {
   position: absolute;
-  top: 47px;
+  top: 68px;
   left: 22px;  
 }
 
 #series-array {
   position: absolute;
-  top: 45px;
+  top: 66px;
   left: 77px; 
 }
 
 #series-array-lbl {
   position: absolute;
-  top: 47px;
+  top: 68px;
   left: 99px;  
 }
 
 #series-no-time-msg {
   position: absolute;
-  top: 66px;
+  top: 87px;
   left: 1px;
   width: calc(100% - 2px);
   height: 30px;
@@ -2227,22 +2372,21 @@ td.equation-expression {
 
 #series-time-step-lbl {
   position: absolute;
-  top: 68px;
+  top: 89px;
   left: 2px;
 }
 
 #series-time-scale {
   position: absolute;
-  top: 67px;
+  top: 88px;
   left: 60px;
   width: 50px;
   font-size: 12px;
-  margin-bottom: 2px;
 }
 
 #series-time-unit {
   position: absolute;
-  top: 67px;
+  top: 88px;
   left: 116px;
   height: 19px;
   width: 45px;
@@ -2251,13 +2395,13 @@ td.equation-expression {
 
 #series-method-lbl {
   position: absolute;
-  top: 91px;
+  top: 112px;
   left: 2px;
 }
 
 #series-method {
   position: absolute;
-  top: 89px;
+  top: 110px;
   left: 50px;
   height: 21px;
   width: 111px;
@@ -2266,7 +2410,7 @@ td.equation-expression {
 
 #series-remote {
   position: absolute;
-  top: 113px;
+  top: 134px;
   left: 3px;
   width: calc(100% - 8px);
 }
@@ -2278,7 +2422,7 @@ td.equation-expression {
 
 #series-data-lbl {
   position: absolute;
-  top: 133px;
+  top: 154px;
   left: 2px;
 }
 
@@ -2286,7 +2430,7 @@ td.equation-expression {
   position: absolute;
   bottom: 13px;
   width: calc(100% - 6px);
-  height: calc(100% - 165px);
+  height: calc(100% - 186px);
   margin: 3px;
 }
 
@@ -2966,9 +3110,9 @@ td.sa-not-run {
   display: none;
   z-index: 20;
   margin: 0;
-  width: 425px;
+  width: 450px;
   height: 275px;
-  min-width: 425px;
+  min-width: 450px;
   min-height: 250px;
   max-height: 99vh;
   max-width: 99vw;
@@ -3050,7 +3194,7 @@ td.sa-not-run {
   position: absolute;
   top: -2px;
   left: 72px;
-  width: 140px;
+  width: 170px;
 }
 
 /* enhance brightness for dark v-btn buttons */
@@ -3449,20 +3593,41 @@ div.no-colors {
   width: calc(100% - 6px);
 }
 
+#xp-iterator-dlg {
+  width: 130px;
+  height: min-content;
+}
+
+#xp-iterator-table {
+  margin: 2px;
+}
+
+input.range-limit {
+  height: 15px !important;
+  width: 30px;
+  text-align: center;
+}
+
 /* the EDIT SETTINGS DIMENSIONS dialog allows editing these dimensions */
-/* NOTE: many styles in common with the EDIT ACTOR DIMENSIONS dialog */ 
-#xp-settings-dlg {
+/* NOTE: many styles in common with the EDIT COMBINATIONS dialog and */
+/* the EDIT ACTOR DIMENSIONS dialog */ 
+#xp-settings-dlg,
+#xp-combination-dlg {
   width: 270px;
   height: 236px;
 }
 
-#xp-actor-s-header,
+#xp-actor-dimension-header,
+#xp-combination-s-header,
+#xp-combination-d-header,
 #xp-settings-s-header,
 #xp-settings-d-header {
   margin: 2px;
 }
 
-#xp-actor-s-header > img,
+#xp-actor-dimension-header > img,
+#xp-combination-s-header > img,
+#xp-combination-d-header > img,
 #xp-settings-s-header > img,
 #xp-settings-d-header > img {
   margin-left: 5px;
@@ -3470,6 +3635,8 @@ div.no-colors {
   vertical-align: bottom;
 }
 
+#xp-combination-s-scroll-area,
+#xp-combination-d-scroll-area,
 #xp-settings-s-scroll-area,
 #xp-settings-d-scroll-area {
   width: 266px;
@@ -3479,6 +3646,8 @@ div.no-colors {
 }
 
 #xp-actor-dimension-table,
+#xp-combination-s-table,
+#xp-combination-d-table,
 #xp-settings-s-table,
 #xp-settings-d-table {
   background-color: white;
@@ -3488,6 +3657,8 @@ div.no-colors {
 }
 
 #xp-actor-dimension-table > tbody > tr:hover,
+#xp-combination-s-table > tbody > tr:hover,
+#xp-combination-d-table > tbody > tr:hover,
 #xp-settings-s-table > tbody > tr:hover,
 #xp-settings-d-table > tbody > tr:hover,
 #xp-clusters-table > tbody > tr:hover {
@@ -3495,33 +3666,43 @@ div.no-colors {
 }
 
 #xp-actor-dimension-table > tbody > tr > td,
+#xp-combination-s-table > tbody > tr > td,
 #xp-settings-s-table > tbody > tr > td,
 #xp-clusters-table > tbody > tr > td {
   border: 1px solid Silver;
 }
 
+#xp-combination-selector-dlg {
+  width: 395px;
+  height: 45px;
+}
+
 #xp-settings-selector-dlg {
   width: 370px;
   height: 45px;
 }
 
 #xp-actor-selector-code,
+#xp-combination-selector-code,
 #xp-settings-selector-code {
   width: 80px;
 }
 
+#xp-combination-selector-string,
 #xp-settings-selector-string {
   width: 182px;
   font-family: monospace;
 }
 
+#xp-combination-dimension-dlg,
 #xp-settings-dimension-dlg {
-  width: 295px;
+  width: 305px;
   height: 45px;
 }
 
+#xp-combination-dimension-string,
 #xp-settings-dimension-string {
-  width: 234px;
+  width: 244px;
 }
 
 span.sd-clear {

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

@@ -45,6 +45,12 @@ const CONFIGURATION = {
     // Default properties for new models
     default_currency_unit: 'EUR',
     default_time_unit: 'hour',
+    // Standard scale units to be included in new models
+    scale_units: [
+        // Units can be defined as 3-tuples [name, scalar, base unit], e.g.,
+        // ['MJ', '1', '1'],
+        // ['kWh', '3.6', 'MJ']
+      ],
     default_scale_unit: '1',  // 1 denotes "no unit" (abstract scale)
     // Font properties for SVG diagram
     // NOTE: When a font name comprises multiple words, it must be enclosed

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

@@ -130,8 +130,9 @@ class Controller {
         end_period: 'End at',
         look_ahead: 'Look-ahead'
       },
-      ENTITY_PROPS: ['actors', 'clusters', 'processes', 'products', 'datasets',
-        'equations', 'links', 'constraints'],
+      ENTITY_PROPS: ['units', 'actors', 'clusters', 'processes', 'products',
+        'datasets', 'equations', 'links', 'constraints'],
+      UNIT_PROPS: ['multiplier', 'base_unit'],
       ACTOR_PROPS: ['weight', 'comments'],
       CLUSTER_PROPS: ['comments', 'collapsed', 'ignore'],
       PROCESS_PROPS: ['comments', 'lower_bound', 'upper_bound', 'initial_level',
@@ -139,8 +140,8 @@ class Controller {
       PRODUCT_PROPS: ['comments', 'lower_bound', 'upper_bound', 'initial_level',
         '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', 'default_selector'],
+      DATASET_PROPS: ['comments', 'default_value', 'scale_unit', 'time_scale',
+        'time_unit', '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'],
@@ -152,7 +153,8 @@ class Controller {
       EXPERIMENT_PROPS: ['comments', 'configuration_dims',
         'column_scenario_dims', 'excluded_selectors'],
     };
-    this.MC.ALL_PROPS = this.MC.ENTITY_PROPS + this.MC.ACTOR_PROPS +
+    this.MC.ALL_PROPS = this.MC.ENTITY_PROPS +
+        this.MC.UNIT_PROPS + this.MC.ACTOR_PROPS +
         this.MC.CLUSTER_PROPS + this.MC.PROCESS_PROPS +
         this.MC.PRODUCT_PROPS + this.MC.DATASET_PROPS + this.MC.LINK_PROPS +
         this.MC.CONSTRAINT_PROPS + this.MC.NOTE_PROPS + this.MC.CHART_PROPS +
@@ -277,9 +279,12 @@ class Controller {
     // Returns `name` without the object-attribute separator |, backslashes,
     // and leading and trailing whitespace, and with all internal whitespace
     // reduced to a single space.
-    return name.replace(this.OA_SEPARATOR, ' ')
+    name = name.replace(this.OA_SEPARATOR, ' ')
         .replace(/\||\\/g, ' ').trim()
         .replace(/\s\s+/g, ' ');
+    // NOTE: this may still result in a single space, which is not a name
+    if(name === ' ') return '';
+    return name;
   }
   
   validName(name) {
@@ -311,6 +316,16 @@ class Controller {
     return n.replace(this.EQUATIONS_DATASET_NAME + '|',
         '<span class="eq">\u221Ax</span>');
   }
+  
+  nameAsConstantString(n) {
+    // Returns name with single quotes if it equals an Linny-R constant
+    // or operator, or when it contains symbol separator characters or ']'
+    let quoted = CONSTANT_SYMBOLS.indexOf(n) >= 0 ||
+        MONADIC_OPERATORS.indexOf(n) >= 0 || n.indexOf(']') >= 0;
+    if(!quoted) SEPARATOR_CHARS.split('').forEach(
+        (c) => { if(n.indexOf(c) >= 0) quoted = true; });
+    return (quoted ? `'${n}'` : n);
+  }
 
   replaceEntity(str, en1, en2) {
     // Returns `en2` if `str` matches entity name `en1`; otherwise FALSE
@@ -329,7 +344,7 @@ class Controller {
     // Return FALSE to indicate "no replacement made"
     return false;
   }
-  
+
   // Methods to notify modeler
   
   setMessage(msg, type, cause=null) {
@@ -437,6 +452,7 @@ class Controller {
   // while they can only be meaningfully performed by the GUI controller
   addListeners() {}
   readyToReset() {}
+  updateScaleUnitList() {}
   drawDiagram() {}
   drawSelection() {}
   drawObject() {}