linny-r 1.3.4 → 1.4.1

package/package.json

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

package/server.js

@@ -910,12 +910,12 @@ function loadData(res, url) {
 //              the call-back Python script specified for the channel
 
 function receiver(res, sp) {
-  //This function processes all receiver actions
+  // This function processes all receiver actions.
   let
       rpath = anyOSpath(sp.get('path') || ''),
       rfile = anyOSpath(sp.get('file') || '');
-  // Assume that path is relative to channel directory unless it starts with
-  // a (back)slash or specifiess drive or volume
+  // Assume that path is relative to working directory unless it starts
+  // with a (back)slash or specifies drive or volume.
   if(!(rpath.startsWith(path.sep) || rpath.indexOf(':') >= 0 ||
       rpath.startsWith(WORKING_DIRECTORY))) {
     rpath = path.join(WORKING_DIRECTORY, rpath);
@@ -1038,8 +1038,49 @@ function rcvrAbort(res, rpath, rfile, log) {
 }
 
 function rcvrReport(res, rpath, rfile, run, data, stats, log) {
+  // Purge reports older than 24 hours.
   try {
-    let fp = path.join(rpath, rfile + run + '-data.txt');
+    const
+      now = new Date(),
+      flist = fs.readdirSync(WORKSPACE.reports);
+    let n = 0;
+    for(let i = 0; i < flist.length; i++) {
+      const
+          pp = path.parse(flist[i]),
+          fp = path.join(WORKSPACE.reports, flist[i]);
+      // NOTE: Only consider text files (extension .txt)
+      if(pp.ext === '.txt') {
+        // Delete only if file is older than 24 hours.
+        const fstat = fs.statSync(fp);
+        if(now - fstat.mtimeMs > 24 * 3600000) {
+          // Delete text file
+          try {
+            fs.unlinkSync(fp);
+            n++;
+          } catch(err) {
+            console.log('WARNING: Failed to delete', fp);
+            console.log(err);
+          }
+        }
+      }
+    }
+    if(n) console.log(n + 'report file' + (n > 1 ? 's' : '') + 'purged');
+  } catch(err) {
+    // Log error, but do not abort.
+    console.log(err);
+  }
+  // Now save the reports.
+  // NOTE: The optional @ indicates where the run number must be inserted.
+  // If not specified, append run number to the base report file name.
+  if(rfile.indexOf('@') < 0) {
+    rfile += run;
+  } else {
+    rfile = rfile.replace('@', run);  
+  }
+  const base = path.join(rpath, rfile);
+  let fp;
+  try {
+    fp = path.join(base + '-data.txt');
     fs.writeFileSync(fp, data);
   } catch(err) {
     console.log(err);
@@ -1048,7 +1089,7 @@ function rcvrReport(res, rpath, rfile, run, data, stats, log) {
     return;
   }
   try {
-    fp = path.join(rpath, rfile + run + '-stats.txt');
+    fp = path.join(base + '-stats.txt');
     fs.writeFileSync(fp, stats);
   } catch(err) {
     console.log(err);
@@ -1057,7 +1098,7 @@ function rcvrReport(res, rpath, rfile, run, data, stats, log) {
     return;
   }
   try {
-    fp = path.join(rpath, rfile + run + '-log.txt');
+    fp = path.join(base + '-log.txt');
     fs.writeFileSync(fp, log);
   } catch(err) {
     console.log(err);
@@ -1630,6 +1671,7 @@ function createWorkspace() {
       data: path.join(SETTINGS.user_dir, 'data'),
       diagrams: path.join(SETTINGS.user_dir, 'diagrams'),
       modules: path.join(SETTINGS.user_dir, 'modules'),
+      reports: path.join(SETTINGS.user_dir, 'reports'),
       solver_output: path.join(SETTINGS.user_dir, 'solver')
     };
   // Create these sub-directories if not aready there

package/static/index.html

@@ -165,7 +165,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
                 // Inform user that newer version exists
                 UI.check_update_modal.element('msg').innerHTML = [
                     '<a href="', GITHUB_REPOSITORY,
-                    '/wiki/Linny-R-version-history#%EF%B8%8F-current-',
+                    '/wiki/Linny-R-version-history#version-',
                     info[1].replaceAll('.', ''), '" ',
                     'title="Click to view version release notes" ',
                     'target="_blank">Version <strong>',
@@ -354,7 +354,7 @@ and move the cursor over the status bar">
     <img id="clone-btn" class="btn disab sep" src="images/clone.png"
          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!">
+         title="Paste selection (Ctrl-V)">
     <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"
@@ -601,6 +601,14 @@ and move the cursor over the status bar">
           </td>
           <td style="padding-bottom:4px">Infer and display cost prices</td>
         </tr>
+        <tr title="Reports will be saved in user/reports/, and removed after 24 h">
+          <td style="padding:0px">
+            <div id="settings-report-results" class="box clear"></div>
+          </td>
+          <td style="padding-bottom:4px">
+            Report results after each run
+          </td>
+        </tr>
         <tr>
           <td style="padding:0px">
             <div id="settings-block-arrows" class="box clear"></div>
@@ -1098,7 +1106,7 @@ NOTE: Unit symbols are case-sensitive, so BTU &ne; Btu">
   <div id="note-modal" class="modal">
     <div id="note-dlg" class="inp-dlg">
       <div class="dlg-title">
-        <span id="note-action">Add</span> note
+        <span id="note-action">Add</span> note <span id="note-number"></span>
         <img class="cancel-btn" src="images/cancel.png">
         <img class="ok-btn" src="images/ok.png">
       </div>
@@ -1280,6 +1288,9 @@ NOTE: Unit symbols are case-sensitive, so BTU &ne; Btu">
     <div id="process-dlg" class="inp-dlg">
       <div class="dlg-title">
         Process properties
+        <div class="simbtn">
+          <img id="process-sim-btn" class="btn sim enab" src="images/process.png">
+        </div>
         <img class="cancel-btn" src="images/cancel.png">
         <img class="ok-btn" src="images/ok.png">
       </div>
@@ -2849,15 +2860,6 @@ where X can be one or several of these letters: ABCDELPQ">
           Auto-increment tail number
         </div>
       </div>
-      <div class="paste-option">
-        <div id="paste-near-box" class="box checked"></div>
-        <div class="paste-tactic">
-          Link to nearest eligible node
-        </div>
-      </div>
-      <div style="font-weight: bold; margin:4px 2px 2px 2px">
-        Mapping of nodes to link from/to:
-      </div>
       <div id="paste-scroll-area">
       </div>
     </div>

package/static/linny-r.css

@@ -346,6 +346,20 @@ div.contbtn {
   cursor: pointer;
 }
 
+div.simbtn {
+  display: none;
+  margin-left: 5px;
+}
+
+img.sim {
+  height: 14px;
+  width: 14px;  
+}
+
+img.sim.enab:hover {
+  background-color: #9e96e5;
+}
+
 input {
   vertical-align: baseline;
 }
@@ -508,6 +522,12 @@ div.notification-msg.first-msg {
   color: black;
 }
 
+span.node-details {
+  font-style: italic;
+  color: Gray;
+  margin-left: 15px;
+}
+
 #issue-panel {
   display: none;
   background-color: Yellow;
@@ -2024,6 +2044,7 @@ div.io-box {
   bottom: 2px;
   left: 2px;
   width: 40%;
+  height: 59px;
 }
 
 #dataset-outcome {
@@ -2241,8 +2262,13 @@ td.equation-selector {
 }
 
 td.wildcard {
+  color: #400080;
+}
+
+span.wildcard {
   font-weight: bold;
-  color: #900040;
+  font-style: normal;
+  color: #a00040;
 }
 
 td.dataset-expression,
@@ -4670,7 +4696,7 @@ div.docu-sym:hover {
 
 /* the CALL STACK modal displays the VM call stack */
 #call-stack-dlg {
-  width: 300px;
+  width: 320px;
   height: 250px;
 }
 

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

@@ -36,6 +36,7 @@ SOFTWARE.
 class Controller {
   constructor() {
     this.console = true;
+    this.browser_name = '';
     // Initialize *graphical* controller elements as non-existent 
     this.paper = null;
     this.buttons = {};
@@ -68,7 +69,8 @@ class Controller {
     this.ERROR = {
         CREATE_FAILED: 'ERROR: failed to create a new SVG element',
         APPEND_FAILED: 'ERROR: failed to append SVG element to DOM',
-        NO_DATASET_DOT: '"." only makes sense in dataset modifier expressions'
+        NO_DATASET_DOT: '"." only makes sense in dataset modifier expressions',
+        NO_NUMBER_CONTEXT: 'Number # is undefined in this context'
       };
     this.WARNING = {
         NO_CONNECTION: 'No connection with server',
@@ -291,8 +293,8 @@ class Controller {
     // 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, 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
+    // underscore, a letter or a digit.
+    // These rules are enforced to avoid 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();
@@ -316,6 +318,14 @@ class Controller {
     return pan;
   }
   
+  completePrefix(name) {
+    // Returns the prefix part (including the final colon plus space),
+    // or the empty string if none.
+    const p = UI.prefixesAndName(name);
+    p[p.length - 1] = '';
+    return p.join(UI.PREFIXER);
+  }
+  
   sharedPrefix(n1, n2) {
     const
         pan1 = this.prefixesAndName(n1),
@@ -331,15 +341,48 @@ class Controller {
     return shared.join(this.PREFIXER);
   }
   
+  colonPrefixedName(name, prefix) {
+    // Replaces a leading colon in `name` by `prefix`.
+    // If `name` identifies a link or a constraint, this is applied to
+    // both node names.
+    const
+        arrow = (name.indexOf(this.LINK_ARROW) >= 0 ?
+            this.LINK_ARROW : this.CONSTRAINT_ARROW),
+        nodes = name.split(arrow);
+    for(let i = 0; i < nodes.length; i++) {
+      nodes[i] = nodes[i].replace(/^:\s*/, prefix);
+    }
+    return nodes.join(arrow);
+  }
+  
+  tailNumber(name) {
+    // Returns the string of digits at the end of `name`. If not there,
+    // check prefixes (if any) from right to left for a tail number.
+    const pan = UI.prefixesAndName(name);
+    let n = endsWithDigits(pan.pop());
+    while(!n && pan.length > 0) {
+      n = endsWithDigits(pan.pop());
+    }
+    return n;
+  }
+  
   nameToID(name) {
     // Returns a name in lower case with link arrow replaced by three
     // underscores, constraint link arrow by four underscores, and spaces
     // converted to underscores; in this way, IDs will always be valid
-    // JavaScript object properties
-    // NOTE: replace single quotes by Unicode apostrophe so that they cannot
-    // interfere with JavaScript strings delimited by single quotes
-    return name.replace(this.LINK_ARROW, '___').replace(this.CONSTRAINT_ARROW,
-      '____').toLowerCase().replace(/\s/g, '_').replace("'", '\u2019');
+    // JavaScript object properties.
+    // NOTE: Links and constraints are a special case, because their IDs
+    // depend on the *codes* of their nodes.
+    if(name.indexOf(UI.LINK_ARROW) >= 0 ||
+        name.indexOf(UI.CONSTRAINT_ARROW) >= 0) {
+      const obj = MODEL.objectByName(name);
+      if(obj) return obj.identifier;
+      // Empty string signals failure.
+      return '';
+    }
+    // NOTE: replace single quotes by Unicode apostrophe so that they
+    // cannot interfere with JavaScript strings delimited by single quotes.
+    return name.toLowerCase().replace(/\s/g, '_').replace("'", '\u2019');
   }
   
   htmlEquationName(n) {