minor changes to the examples/region_optimal.ipynb and _gqr

Author: Jimmy-INL

examples/cost_constrained_qr.ipynb

@@ -334,8 +334,9 @@
   }
  ],
  "metadata": {
+  "hide_input": false,
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -349,7 +350,35 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.9"
+   "version": "3.9.5"
+  },
+  "latex_envs": {
+   "LaTeX_envs_menu_present": true,
+   "autoclose": false,
+   "autocomplete": true,
+   "bibliofile": "biblio.bib",
+   "cite_by": "apalike",
+   "current_citInitial": 1,
+   "eqLabelWithNumbers": true,
+   "eqNumInitial": 1,
+   "hotkeys": {
+    "equation": "Ctrl-E",
+    "itemize": "Ctrl-I"
+   },
+   "labels_anchors": false,
+   "latex_user_defs": false,
+   "report_style_numbering": false,
+   "user_envs_cfg": false
+  },
+  "nbTranslate": {
+   "displayLangs": [
+    "*"
+   ],
+   "hotkey": "alt-t",
+   "langInMainMenu": true,
+   "sourceLang": "en",
+   "targetLang": "fr",
+   "useGoogleTranslate": true
   },
   "toc": {
    "base_numbering": 1,
@@ -363,6 +392,35 @@
    "toc_position": {},
    "toc_section_display": true,
    "toc_window_display": false
+  },
+  "varInspector": {
+   "cols": {
+    "lenName": 16,
+    "lenType": 16,
+    "lenVar": 40
+   },
+   "kernels_config": {
+    "python": {
+     "delete_cmd_postfix": "",
+     "delete_cmd_prefix": "del ",
+     "library": "var_list.py",
+     "varRefreshCmd": "print(var_dic_list())"
+    },
+    "r": {
+     "delete_cmd_postfix": ") ",
+     "delete_cmd_prefix": "rm(",
+     "library": "var_list.r",
+     "varRefreshCmd": "cat(var_dic_list()) "
+    }
+   },
+   "types_to_exclude": [
+    "module",
+    "function",
+    "builtin_function_or_method",
+    "instance",
+    "_Feature"
+   ],
+   "window_display": false
   }
  },
  "nbformat": 4,

examples/region_optimal.ipynb

@@ -35,7 +35,7 @@ def __init__(self,idx_constrained,n_sensors,const_sensors,all_sensors):
             Ranked list of sensor locations.
         idx_constrained : np.ndarray, shape [No. of constrained locations]
             Column Indices of the sensors in the constrained locations.
-        n_sensors : integer, 
+        n_sensors : integer,
             Total number of sensors
         const_sensors : integer,
             Total number of sensors required by the user in the constrained region.
@@ -88,7 +88,7 @@ def fit(
 
             # Choose pivot
             i_piv = np.argmax(dlens_updated)
-          
+
             dlen = dlens_updated[i_piv]
 
             if dlen > 0:
@@ -174,7 +174,7 @@ def getConstraindSensorsIndices(xmin, xmax, ymin, ymax, nx, ny, all_sensors):
 
     Parameters
         ----------
-        xmin: int, 
+        xmin: int,
             Lower bound for the x-axis constraint
         xmax : int,
             Upper bound for the x-axis constraint
@@ -187,7 +187,7 @@ def getConstraindSensorsIndices(xmin, xmax, ymin, ymax, nx, ny, all_sensors):
 
         Returns
         -------
-        idx_constrained : np.darray, shape [No. of constrained locations] 
+        idx_constrained : np.darray, shape [No. of constrained locations]
             Array which contains the constrained locationsof the grid in terms of column indices of basis_matrix.
     """
     n_features = len(all_sensors)
@@ -232,7 +232,6 @@ def functionalConstraint(position, func_response,func_input, freeTerm):
 
 
 if __name__ == '__main__':
-    pass
     faces = datasets.fetch_olivetti_faces(shuffle=True)
     X = faces.data
 
@@ -278,16 +277,16 @@ def plot_gallery(title, images, n_col=n_col, n_row=n_row, cmap=plt.cm.gray):
 
     all_sensors = model.get_all_sensors()
 
-    ##Constrained sensor location on the grid: 
+    ##Constrained sensor location on the grid:
     xmin = 20
     xmax = 40
     ymin = 25
     ymax = 45
-    sensors_constrained = getConstraindSensorsIndices(xmin,xmax,ymin,ymax,nx,ny,all_sensors) #Constrained column indices 
+    sensors_constrained = getConstraindSensorsIndices(xmin,xmax,ymin,ymax,nx,ny,all_sensors) #Constrained column indices
 
     # didx = np.isin(all_sensors,sensors_constrained,invert=False)
     # const_index = np.nonzero(didx)
-    # j = 
+    # j =
 
 
     ##Plotting the constrained region