linny-r 1.2.1 → 1.3.0

package/README.md

@@ -25,7 +25,7 @@ Technical documentation will be developed on GitHub: https://github.com/pwgbots/
 Linny-R is developed as a JavaScript package, and requires that **Node.js** is installed on your computer. 
 This software can be downloaded from <a href="https://nodejs.org" target="_blank">https://nodejs.org</a>. 
 Make sure that you choose the correct installer for your computer.
-Linny-R is developed using the _current_ release. Presently (April 2023) this is 20.0.0. 
+Linny-R is developed using the _current_ release. Presently (June 2023) this is 20.3.0. 
 
 Run the installer and accept the default settings.
 There is **no** need to install the optional _Tools for Native Modules_.
@@ -36,7 +36,7 @@ Verify the installation by typing:
 
 ``node --version``
 
-The response should be the version number of Node.js, for example: v20.0.0.
+The response should be the version number of Node.js, for example: v20.3.0.
 
 ## Installing Linny-R
 It is advisable to install Linny-R in a directory on your computer, not in a cloud. 
@@ -170,8 +170,8 @@ Open the Command Line Interface (CLI) of your computer, change to your `WORKING_
 This response should be something similar to:
 
 <pre>
-Node.js server for Linny-R version 1.1.21
-Node.js version: v20.0.0
+Node.js server for Linny-R version 1.2.1
+Node.js version: v20.3.0
 ... etc.
 </pre>
 
@@ -286,8 +286,8 @@ To install Inkscape, please look here: https://inkscape.org/release
 Linny-R will automatically detect whether Inkscape is installed by searching for it in the environment variable PATH on your computer.
 On a macOS computer, Linny-R will look for Inkscape in /Applications/Inkscape.app/Contents/MacOS.
 
-**NOTE:** The current installation wizard for Inkscape (version 1.2) does **not** add the application to the PATH variable,
-so you need to do this yourself.
+**NOTE:** The current installation wizard for Inkscape (version 1.2.2) may **not** add the application to the PATH variable.
+Please check whether you need to do this yourself.
 
 ## Using Linny-R console
 

package/console.js

@@ -196,7 +196,7 @@ class ConsoleMonitor {
     return true;
   }
 
-  submitBlockToSolver(bcode) {
+  submitBlockToSolver() {
     let top = MODEL.timeout_period;
     if(VM.max_solver_time && top > VM.max_solver_time) {
       top = VM.max_solver_time;
@@ -211,7 +211,7 @@ class ConsoleMonitor {
             token: VM.solver_token,
             block: VM.block_count,
             round: VM.round_sequence[VM.current_round],
-            data: bcode,
+            data: VM.lines,
             timeout: top
           }));
       VM.processServerResponse(data);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linny-r",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Executable graphical language with WYSIWYG editor for MILP models",
   "main": "server.js",
   "scripts": {
@@ -29,4 +29,4 @@
     "url": "https://github.com/pwgbots/linny-r/issues"
   },
   "homepage": "https://github.com/pwgbots/linny-r#readme"
-}
+}

package/static/index.html

@@ -28,7 +28,7 @@ implementation is made available via the Linny-R web site.
 -->
 
 <!--
-Copyright (c) 2017-2022 Delft University of Technology
+Copyright (c) 2017-2023 Delft University of Technology
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -239,7 +239,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
       <img id="load-btn" class="btn enab" src="images/open.png"
            title="Load model (Ctrl-L)">
       <img id="settings-btn" class="btn enab" src="images/settings.png"
-           title="Change settings (Ctrl-V)">
+           title="Change model settings (Alt-M)">
       <img id="save-btn" class="btn enab" src="images/save.png"
            title="Save model (Ctrl-S)">
       <img id="repository-btn" class="btn enab" src="images/repository.png"
@@ -321,6 +321,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
         <td id="step-sep">
           <img id="stepforward-btn" class="sbtn senab" src="images/forward.png">
         </td>
+        <td id="issue-panel">
+          <span id="prev-issue">&#x25C1;</span>
+          <span id="issue-nr"></span>
+          <span id="next-issue">&#x25B7;</span>
+        </td>
         <td id="info-line" title="Status bar"></td>
         <td id="autosave-sep">
           <img id="autosave-btn" class="btn enab" src="images/restore.png">
@@ -347,7 +352,9 @@ and move the cursor over the status bar">
     <img id="note-btn" class="btn toggle enab sep" src="images/note.png"
          title="Add note">
     <img id="clone-btn" class="btn disab sep" src="images/clone.png"
-         title="Clone selection (Ctrl-C)">
+         title="Copy selection (Ctrl-C) &ndash; Alt-click to clone (Alt-C)">
+    <img id="paste-btn" class="btn disab sep" src="images/paste.png"
+         title="Paste selection (Ctrl-V) -- WORK IN PROGESS!">
     <img id="delete-btn" class="btn disab sep" src="images/delete.png"
          title="Delete">
     <img id="undo-btn" class="btn enab" src="images/undo.png"
@@ -1530,7 +1537,8 @@ NOTE: Unit symbols are case-sensitive, so BTU &ne; Btu">
     <div id="ds-filter-bar">
       <input id="ds-filter-text" type="text"
              placeholder="(name filtering pattern)"
-             title="Pattern may contain logical & (AND), | (OR) and ^ (NOT)">
+             title="Pattern may contain logical & (AND), | (OR) and ^ (NOT)
+Start with = to find exact match, with ~ to match first characters">
     </div>
     <div id="dataset-scroll-area">
       <table id="dataset-table">
@@ -1584,6 +1592,9 @@ NOTE: Unit symbols are case-sensitive, so BTU &ne; Btu">
       <img id="ds-delete-modif-btn" class="btn disab"
            src="images/delete.png" title="Delete selected modifier"
            style="margin-left: 20px">
+      <img id="ds-convert-modif-btn" class="btn enab blink"
+           src="images/dataset.png" title="Convert modifiers to prefixed datasets"
+           style="margin-left: 20px; display: none">
     </div>
     <div id="dataset-resize" class="resizer"></div>
   </div>
@@ -1604,7 +1615,7 @@ NOTE: Unit symbols are case-sensitive, so BTU &ne; Btu">
   <div id="rename-dataset-modal" class="modal">
     <div id="rename-dataset-dlg" class="inp-dlg">
       <div class="dlg-title">
-        Rename dataset
+        <span id="rename-dataset-title">Rename dataset</span>
         <img class="cancel-btn" src="images/cancel.png">
         <img class="ok-btn" src="images/ok.png">
       </div>
@@ -1643,6 +1654,23 @@ NOTE: * and ? will be interpreted as wildcards"
     </div>
   </div>
 
+  <!-- the CONVERT MODIFIER prompts for the new name of a dataset -->
+  <div id="convert-modifiers-modal" class="modal">
+    <div id="convert-modifiers-dlg" class="inp-dlg">
+      <div class="dlg-title">
+        Convert modifiers to datasets
+        <img class="cancel-btn" src="images/cancel.png">
+        <img class="ok-btn" src="images/ok.png">
+      </div>
+      <div style="margin: 4px">
+        Each modifier will become a dataset
+        <tt><em>prefix</em>:&nbsp;<em>selector</em></tt>
+        using this prefix: 
+      </div>
+      <input id="convert-modifiers-prefix" type="text" autocomplete="off">
+    </div>
+  </div>
+
   <!-- the SERIES dialog presents the properties of the time series
        data of the selected dataset, including a text area for copy/paste
        of numbers while showing the line count and checking for correct
@@ -1859,7 +1887,8 @@ NOTE: * and ? will be interpreted as wildcards"
       <div style="padding: 4px; width: 100px">
         <div id="variable-color-div">
           <div style="display:inline-block; vertical-align:top">Color:</div>
-          <div id="variable-color"></div>
+          <div id="variable-color" title="Click to copy, Shift-click to paste"></div>
+          <div id="variable-paste-color"></div>
         </div>
         <div id="variable-scale-div" style="margin-top: 3px">
           <div style="display:inline-block; vertical-align:top; margin-top: 2px">

package/static/linny-r.css

@@ -10,7 +10,7 @@ file that implements the graphical user interface for Linny-R.
 */
 
 /*
-Copyright (c) 2017-2022 Delft University of Technology
+Copyright (c) 2017-2023 Delft University of Technology
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -413,6 +413,7 @@ textarea {
 #zoom-sep,
 #step-sep,
 #info-line,
+#issue-panel,
 #autosave-sep {
   border-right: 1px solid #e2d8e8;
 }
@@ -507,6 +508,36 @@ div.notification-msg.first-msg {
   color: black;
 }
 
+#issue-panel {
+  display: none;
+  background-color: Yellow;
+  white-space: nowrap;
+  padding: 0 3px;
+}
+
+#issue-nr {
+  padding: 0 4px;
+  cursor: pointer;
+}
+
+#prev-issue,
+#next-issue {
+  cursor: pointer;
+}
+
+#prev-issue:hover,
+#issue-nr:hover,
+#next-issue:hover {
+  color: Orange;
+}
+
+#prev-issue.disab,
+#next-issue.disab {
+  cursor: default;
+  pointer-events: none;
+  color: #e8d898;
+}
+
 /* Modal dialogs cover the entire browser window with a dark,
    semi-transparent DIV that ignores mouse events. Their z-index
    is 100+ so that they cover "stay-on-top" dialogs. */ 
@@ -2091,84 +2122,103 @@ tr.def-sel {
   font-weight: bold;
 }
 
-td.modif::before {
+tr.dataset > td > div {
+  display: inline-block;
+}
+
+div.ds-indent {
+  color: #909090;
+  text-align: right;
+  font-weight: normal !important;
+  margin-right: 2px;
+  margin-left: 3px;
+}
+
+div.tree-btn {
+  color: #909090;
+  margin-right: 3px;
+  cursor: pointer;
+  margin-left: -13px;
+}
+
+div.modif::before {
   content: ' \2045';
   color: #b00080;
   margin-right: 2px;
 }
 
-td.outcome::before {
+div.outcome::before {
   content: ' \25C8';
   color: #b00080;
   margin-right: 1px;
 }
 
-td.array::before {
+div.array::before {
   content: ' \2263';
   color: #b00080;
   margin-right: 1px;
 }
 
-td.series::before {
+div.series::before {
   content: ' \28B8';
   color: #b00080;
   margin-left: -4px;
 }
 
-td.outcome.modif::before {
+div.outcome.modif::before {
   content: ' \25C8\2045';
   color: #b00080;
   margin-right: 2px;
 }
 
-td.array.modif::before {
+div.array.modif::before {
   content: ' \2263\2045';
   color: #b00080;
   margin-right: 1px;
 }
 
-td.series.modif::before {
+div.series.modif::before {
   content: ' \28B8\2045';
   color: #b00080;
   margin-left: -4px;
 }
 
-td.blackbox::before {
+div.blackbox::before {
   content: ' \25FC';
   color: #b00080;
 }
 
-td.blackbox.series::before {
+div.blackbox.series::before {
   content: ' \25FC\28B8';
   color: #b00080;
 }
 
-td.blackbox.array::before {
+div.blackbox.array::before {
   content: ' \25FC\2263';
   color: #b00080;
 }
 
-td.blackbox.outcome::before {
+div.blackbox.outcome::before {
   content: ' \25FC\25C8';
   color: #b00080;
 }
 
-td.blackbox.modif::before {
+div.blackbox.modif::before {
   content: ' \25FC\2045';
   color: #b00080;
 }
 
-td.blackbox.series.modif::before {
+div.blackbox.series.modif::before {
   content: ' \25FC\28B8\2045';
   color: #b00080;
 }
 
-td.blackbox.array.modif::before {
+div.blackbox.array.modif::before {
   content: ' \25FC\2263\2045';
   color: #b00080;
 }
 
-td.blackbox.outcome.modif::before {
+div.blackbox.outcome.modif::before {
   content: ' \25FC\25C8\2045';
   color: #b00080;
 }
@@ -2294,6 +2344,17 @@ td.equation-expression {
   bottom: 5px;
 }
 
+/* CONVERT MODIFIERS modal dialog */
+#convert-modifiers-dlg {
+  width: 220px;
+  height: 84px;
+}
+
+#convert-modifiers-prefix {
+  margin: 3px;
+  width: calc(100% - 8px);
+}
+
 /* SERIES modal dialog */
 #series-dlg {
   width: 165px;
@@ -2738,6 +2799,17 @@ img.v-disab {
   height: 15px;
   border: 1px solid Black;
   background-color: #c00000;
+  cursor: pointer;
+}
+
+#variable-paste-color {
+  display: none;
+  vertical-align: top;
+  margin-left: 3px;
+  width: 13px;
+  height: 13px;
+  border: 1px solid Silver;
+  background-color: #c00000;
 }
 
 #variable-scale {

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

@@ -12,7 +12,7 @@ file all have their graphical extensions in file linny-r-gui.js.
 */
 
 /*
-Copyright (c) 2017-2022 Delft University of Technology
+Copyright (c) 2017-2023 Delft University of Technology
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -290,15 +290,32 @@ class Controller {
   validName(name) {
     // Returns TRUE if `name` is a valid Linny-R entity name. These names
     // must not be empty strings, may not contain brackets, backslashes or
-    // vertical bars, and must start with an underscore, a letter or a digit;
-    // this is enforced mainly to preclude parsing issues with variable names
+    // vertical bars, may not end with a colon, and must start with an
+    // underscore, a letter or a digit. This is enforced mainly to
+    // preclude parsing issues with variable names
     // NOTE: normalize to also accept letters with accents
     if(name === this.TOP_CLUSTER_NAME) return true;
     name = name.normalize('NFKD').trim();
-    return name && !name.match(/\[\\\|\]/) &&
+    return name && !name.match(/\[\\\|\]/) && !name.endsWith(':') &&
         (name.startsWith(this.BLACK_BOX) || name[0].match(/[\w]/));
   }
   
+  prefixesAndName(name) {
+    // Returns name split exclusively at '[non-space]: [non-space]'
+    const
+        s = name.split(this.PREFIXER),
+        pan = [s[0]];
+    for(let i = 1; i < s.length; i++) {
+      const j = pan.length - 1;
+      if(s[i].startsWith(' ') || (i > 0 && pan[j].endsWith(' '))) {
+        pan[j] += s[i];
+      } else {
+        pan.push(s[i]);
+      }
+    }
+    return pan;
+  }
+  
   nameToID(name) {
     // Returns a name in lower case with link arrow replaced by three
     // underscores, constraint link arrow by four underscores, and spaces
@@ -466,6 +483,7 @@ class Controller {
   rotatingIcon() {}
   setProgressNeedle() {}
   updateTimeStep() {}
+  updateIssuePanel() {}
   updateDraggableDialogs() {}
   logHeapSize() {}