linny-r 3.0.0 → 3.0.1

package/console.js

@@ -16,7 +16,7 @@ NOTE: For browser-based Linny-R, this file should NOT be loaded, as it
 */
 
 /*
-Copyright (c) 2017-2024 Delft University of Technology
+Copyright (c) 2017-2026 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
@@ -117,19 +117,17 @@ Possible options are:
                         (FUTURE OPTION)
   check                 will report whether current version is up-to-date
   data-dir=[path]       will look for series data files in [path] instead of
-                        (main)/user/data
+                        (Linny-R)/user/data
   model=[path]          will load model file specified by [path]
-  module=[name@repo]    will load model [name] from repository [repo]
-                        (if @repo is blank, repository "local host" is used)
-                        (FUTURE OPTION)
+                        (relative paths are searched for in (Linny-R)/user/models)
   report=[name]         will write run results to [name]-series.txt and
                         [name]-stats.txt in (workspace)/reports
   run                   will run the loaded model
   solver=[name]         will select solver [name], or warn if not found
-                        (name choices: Gurobi, CPLEX, SCIP or LP_solve)
+                        (name choices: Gurobi, CPLEX, MOSEK, SCIP or LP_solve)
   user=[identifier]     user ID will be used to log onto remote servers
   verbose               will output solver messages to the console
-  workspace=[path]      will create workspace in [path] instead of (main)/user
+  workspace=[path]      will create workspace in [path] instead of (Linny-R)/user
   xrun=[title#list]     will perform experiment runs in given range
                         (list is comma-separated sequence of run numbers)
 `;
@@ -262,60 +260,6 @@ class ConsoleMonitor {
 } // END of class ConsoleMonitor
 
 
-// NOTE: This implementation is very incomplete, still!
-class ConsoleRepositoryBrowser {
-  constructor() {
-    this.repositories = [];
-    this.repository_index = -1; 
-    this.module_index = -1;
-    // Get the repository list from the modules.
-    this.getRepositories();
-    this.reset();
-  }
-  
-  reset() {
-    this.visible = false;
-  }
-
-  get isLocalHost() {
-    // Return TRUE if first repository on the list is 'local host'.
-    return this.repositories.length > 0 &&
-      this.repositories[0].name === 'local host';
-  }
-
-  getRepositories() {
-    // Gets the list of repository names from the server.
-    this.repositories.length = 0;
-    // @@TO DO!!
-  }
-  
-  repositoryByName(n) {
-    // Return the repository having name `n` if already known, otherwise NULL.
-    for(let i = 0; i < this.repositories.length; i++) {
-      if(this.repositories[i].name === n) {
-        return this.repositories[i];
-      }
-    }
-    return null;
-  }
-  
-  asFileName(s) {
-    // NOTE: asFileName is implemented as function (see below) to permit
-    // its use prior to instantiation of the RepositoryBrowser.
-    return stringToFileName(s);
-  }
-  
-}
-
-function stringToFileName(s) {
-  // Return string `s` with whitespace converted to a single dash, and
-  // special characters converted to underscores.
-  return s.normalize('NFKD').trim()
-      .replace(/[\s\-]+/g, '-')
-      .replace(/[^A-Za-z0-9_\-]/g, '_')
-      .replace(/^[\-\_]+|[\-\_]+$/g, '');
-}
-
 // CLASS ConsoleFileManager allows loading and saving models and diagrams, and
 // handles the interaction with the MILP solver via `exec` calls and files
 // stored on the modeler's computer
@@ -337,6 +281,31 @@ class ConsoleFileManager {
     return path.join(...parts);
   }
   
+  asFilePath(s, no_sep=false) {
+    // Return string `s` with whitespace converted to a single dash, and
+    // special characters (also periods!) converted to underscores.
+    // NOTE: Permit functional use of directory separator unless `no_sep`
+    // is FALSE.
+    const sanitize = (str) => str.trim()
+        // Consider dashes, commas and (semi)colons as whitespace, and
+        // condense all such "whitespace" into a single dash.
+        .replace(/[\s\-\,\;\:]+/g, '-')
+        // Condense special characters into a single underscore.
+        .replace(/[^A-Za-z0-9_\-]+/g, '_')
+        // No leading or trailing dashes or underscores.
+        .replace(/^[\-\_]+|[\-\_]+$/g, '');
+    s = s.trim().normalize('NFKD');
+    if(no_sep) return sanitize(s);
+    // When path is acceptable, split at both '/' and '\', because
+    // names may be constructed on different OS platforms.
+    return s.trim().split(/\/|\\/)
+        .map((p) => sanitize(p))
+        // Remove empty strings.
+        .filter((p) => p)
+        // Use the OS platform separator to reconstruct the path.
+        .join(path.sep);
+  }
+
   getRemoteData(dataset, url) {
     // Gets data from a URL, or from a file on the local host 
     if(url === '') return;
@@ -849,7 +818,14 @@ function commandLineSettings() {
           if(mp.ext !== '.lnr') {
             console.log('WARNING: Model file should have extension .lnr');
           }
-          fs.accessSync(av[1], fs.constants.R_OK);
+          try {
+            fs.accessSync(av[1], fs.constants.R_OK);
+          } catch(err) {
+            if(!mp.root && !mp.dir.startsWith('.')) {
+              av[1] = path.join(settings.user_dir, 'models', av[1]);
+            }
+            fs.accessSync(av[1], fs.constants.R_OK);
+          }
           settings.model_path = av[1];
         } catch(err) {
           console.log(`ERROR: File "${av[1]}" not found`);
@@ -873,18 +849,15 @@ function commandLineSettings() {
           console.log('ERROR: Failed to create data directory:', dp);
         }
       } else if(av[0] === 'report') {
-        // Set report file name (if valid)
-        const rfn = stringToFileName(av[1]);
+        // Set report file name (if valid).
+        // NOTE: No sub-directories for report files, so path separators
+        // are ignored.
+        const rfn = FILE_MANAGER.asFilePath(av[1], true);
         if(/^[A-Za-z0-9]+/.test(rfn)) {
           settings.report = path.join(settings.user_dir, 'reports', rfn);
         } else {
           console.log(`WARNING: Invalid report file name "{$rfn}"`);
         }
-      } else if(av[0] === 'module') {
-        // Add default repository is none specified
-        if(av[1].indexOf('@') < 0) av[1] += '@local host';
-        // Check is repository exists, etc.
-        // @@@TO DO!
       } else if(av[0] === 'xrun') {
         if(!av[1].trim()) {
           // NOTE: `x_title` = TRUE indicates: list available experiments.
@@ -1037,10 +1010,10 @@ PROMPTER.questionPrompt = (str) => {
 //PROMPTER.stdoutMuted = true;
 */
 
-// Initialize the Linny-R console components as global variables
+// Initialize the Linny-R console components as global variables.
 global.UI = new Controller();
 global.VM = new VirtualMachine();
-global.REPOSITORY_BROWSER = new ConsoleRepositoryBrowser();
+global.POWER_GRID_MANAGER = new PowerGridManager();
 global.FILE_MANAGER = new ConsoleFileManager();
 global.DATASET_MANAGER = new DatasetManager();
 global.CHART_MANAGER = new ChartManager();
@@ -1050,10 +1023,8 @@ global.MONITOR = new ConsoleMonitor();
 global.RECEIVER = new ConsoleReceiver();
 global.IO_CONTEXT = null;
 global.MODEL = new LinnyRModel();
-
 // Connect the virtual machine (may prompt for password).
 MONITOR.connectToServer();
-
 // Load the model if specified.
 if(SETTINGS.model_path) {
   FILE_MANAGER.loadModel(SETTINGS.model_path, (model) => {

package/package.json

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

package/static/index.html

@@ -2878,8 +2878,8 @@ When modeling power grids, -c indicates “disregard grid capacity”,
     </div>
   </div>
 
-  <!-- The "clusters to ignore" dialog displays a scrollable list of clusters
-       set to be ignored for specified selectors.
+  <!-- The "clusters to ignore" dialog displays a scrollable list of *name patterns*
+       for clusters set to be ignored for specified selectors.
        NOTE: Changes to this list are discarded if CANCEL is clicked.
     -->
   <div id="xp-clusters-modal" class="modal">
@@ -2889,26 +2889,48 @@ When modeling power grids, -c indicates &ldquo;disregard grid capacity&rdquo;,
         <img class="cancel-btn" src="images/cancel.png">
         <img class="ok-btn" src="images/ok.png">
       </div>
-      <select id="xp-clusters-select"></select>
-      <img id="xp-clusters-add-btn" src="images/add.png" class="btn enab"
-           title="Add cluster to list">
       <div id="xp-clusters-no-list">
         No clusters set to be ignored
       </div>
       <div id="xp-clusters-list">      
         <div id="xp-clusters-scroll-hdr">
-          <div id="xp-clusters-name-hdr">Cluster</div>
+          <div id="xp-clusters-name-hdr">Cluster name pattern</div>
           <div id="xp-clusters-selectors-hdr">Selector(s)</div>
         </div>
         <div id="xp-clusters-scroll">
           <table id="xp-clusters-table" width="100%"></table>
         </div>
-        <div id="xp-clusters-selectors-div">
-          Selector(s):
-          <input id="xp-clusters-selectors" type="text" autocomplete="off">
-          <img id="xp-clusters-delete-btn" src="images/remove.png"
-               class="btn enab" title="Delete cluster from list">
-        </div>
+      </div>
+      <div id="xp-clusters-buttons">
+        <img id="xp-clusters-new-btn" class="btn enab" src="images/new.png"
+             title="New cluster selection pattern">
+        <img id="xp-clusters-edit-btn" class="btn disab" src="images/edit.png"
+             title="Edit selected pattern">
+        <img id="xp-clusters-delete-btn" class="btn disab" src="images/delete.png"
+             title="Delete selected pattern">
+      </div>
+    </div>
+  </div>
+
+  <!-- Modal to appear when the New button or Edit button of the
+       "clusters to ignore" dialog is clicked.
+    -->
+  <div id="xp-pattern-modal" class="modal">
+    <div id="xp-pattern-dlg" class="inp-dlg">
+      <div class="dlg-title">
+        <span id="xp-pattern-action">Add</span> cluster selection
+        <img class="cancel-btn" src="images/cancel.png">
+        <img class="ok-btn" src="images/ok.png">
+      </div>
+      <div id="xp-pattern-filter">
+        <label>Filter:</label>
+        <input id="xp-pattern-pattern" type="text">
+        <div id="xp-pattern-matches">(no matches)</div>
+      </div>
+      <div id="xp-pattern-selectors-div">
+        <label>Selector(s):</label>
+        <input id="xp-pattern-selectors" type="text" autocomplete="off">
+        <div id="xp-pattern-dimensions">(no dimensions)</div>
       </div>
     </div>
   </div>
@@ -3136,7 +3158,7 @@ where X can be one or several of these letters: ABCDELPQ">
       </div>
       <div id="check-update-msg"></div>
       <div id="check-update-buttons">
-        <img class="ok-btn" src="images/ok.png">
+        <img id="check-update-ok-btn" class="ok-btn" src="images/ok.png">
         Shut down server to install new version
         <img class="cancel-btn" src="images/cancel.png">
         Continue using current version

package/static/linny-r.css

@@ -2160,6 +2160,7 @@ div.export {
 #replace-div {
   min-width: 200px;
   margin: 3px 0 3px 2px;
+  white-space: nowrap;
 }
 
 #replace-by-name {
@@ -4243,7 +4244,8 @@ td.sa-not-run {
   width: 20px;
 }
 
-#xp-delete-btn {
+#xp-delete-btn,
+#xp-clusters-delete-btn {
   position: absolute;
   right: 2px;
 }
@@ -4950,15 +4952,15 @@ span.sd-clear {
   font-family: monospace;
 }
 
+/* the CLUSTERS TO INGNORE dialog */
 #xp-clusters-dlg {
   width: 408px;
   height: min-content;  
 }
 
-#xp-clusters-select {
-  width: 380px;
-  font-size: 12px;
-  margin: 2px;
+#xp-clusters-buttons > img.btn {
+  height: 20px;
+  width: 20px;
 }
 
 #xp-clusters-add-btn {
@@ -4986,12 +4988,12 @@ span.sd-clear {
 }
 
 #xp-clusters-name-hdr {
-  width: 300px;
+  width: 250px;
   display: inline-block;
 }
 
 #xp-clusters-selectors-hdr {
-  width: 100px;
+  width: 150px;
   display: inline-block;
 }
 
@@ -5003,29 +5005,61 @@ span.sd-clear {
   border-top: 1px solid Silver;
 }
 
-#xp-clusters-table > tbody > tr > td:last-child {
-  width: 100px;
-  max-width: 100px;
+td.c-pat {
+  border-right: none !important;
+}
+
+td.c-match {
+  width: 5%;
+  color: Gray;
+  border-left: none !important;
+  font-style: italic;
+  text-align: right;
+  padding-right: 2px;
+}
+
+td.c-sels {
+  width: 150px;
+  max-width: 150px;
+}
+
+/* the CLUSTER PATTERN dialog */
+#xp-pattern-dlg {
+  width: 370px;
+  height: min-content;  
 }
 
-#xp-clusters-selectors-div {
+#xp-pattern-filter {
+  margin: 1px 0 0 2px;
+}
+
+#xp-pattern-pattern {
+  width: 220px;
+  font-size: 12px;
+  margin: 2px;
+}
+
+#xp-pattern-matches,
+#xp-pattern-dimensions {
+  display: inline-block;
+  font-style: italic;
+  color: Gray;
+  width: 90px;
+  margin: 2px;
+}
+
+#xp-pattern-selectors-div {
   margin: 2px;
+  margin-bottom: 3px;
   width: calc(100% - 4px);
 }
 
-#xp-clusters-selectors {
-  width: 318px;
-  height: 16px !important;
+#xp-pattern-selectors {
+  width: 193px;
   font-size: 12px;
+  margin: 0 2px;
 }
 
-#xp-clusters-delete-btn {
-  position: absolute;
-  bottom: 2px;
-  right: 2px;
-  height: 18px;
-  width: 18px;
-}
 
 /* The BROWSER DIALOG is a resizable modal dialog for the File manager */
 #browser-dlg {

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

@@ -13,7 +13,7 @@ the Linny-R software is available.
 */
 
 /*
-Copyright (c) 2017-2025 Delft University of Technology
+Copyright (c) 2017-2026 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
@@ -176,11 +176,11 @@ function checkForUpdates() {
                   'This is a <em>major</em> version change, so automatic ',
                   'updating is <strong>not</strong> possible.<br>',
                   'Please read <a href="', GITHUB_REPOSITORY,
-                  '/linny-r#updating-to-the-latest-version-of-linny-r" ',
+                  '#updating-to-the-latest-version-of-linny-r" ',
                   'target="_blank"> this information on GitHub</a> ',
                   ' on how to manually upgrade Linny-R.'].join('');
               // ... so shutdown instead of update...
-              UI.removeListeners(UI.check_update_modal.ok)
+              UI.removeListeners('check-update-ok-btn')
                   .addEventListener('click', () => UI.shutDownServer());
               // ... and show blinking notification in dialog header.
               blinker.style.display = 'inline-block';
@@ -217,7 +217,7 @@ function initializeLinnyR() {
   X_EDIT = new ExpressionEditor();
   ACTOR_MANAGER = new ActorManager();
   SCALE_UNIT_MANAGER = new ScaleUnitManager();
-  POWER_GRID_MANAGER = new PowerGridManager();
+  POWER_GRID_MANAGER = new GUIPowerGridManager();
   EQUATION_MANAGER = new EquationManager();
   FINDER = new Finder();
   CONSTRAINT_EDITOR = new ConstraintEditor();