Skip to content

Commit f434583

Browse files
Niharika KarnikNiharika Karnik
authored andcommitted
Merge branch 'niharika-krithika-mohammad-regionConstraints' of https://github.com/niharika2999/pysensors into niharika-krithika-mohammad-regionConstraints
Please enter a commit message to explain why this merge is necessary, For working on my personal computer
2 parents 571b40d + 67d3bb8 commit f434583

File tree

13 files changed

+4946
-6
lines changed

13 files changed

+4946
-6
lines changed

examples/basis_comparison-Copy1.ipynb

Lines changed: 962 additions & 0 deletions
Large diffs are not rendered by default.

examples/cost_constrained_qr.ipynb

Lines changed: 60 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,9 @@
334334
}
335335
],
336336
"metadata": {
337+
"hide_input": false,
337338
"kernelspec": {
338-
"display_name": "Python 3",
339+
"display_name": "Python 3 (ipykernel)",
339340
"language": "python",
340341
"name": "python3"
341342
},
@@ -349,7 +350,35 @@
349350
"name": "python",
350351
"nbconvert_exporter": "python",
351352
"pygments_lexer": "ipython3",
352-
"version": "3.6.9"
353+
"version": "3.9.5"
354+
},
355+
"latex_envs": {
356+
"LaTeX_envs_menu_present": true,
357+
"autoclose": false,
358+
"autocomplete": true,
359+
"bibliofile": "biblio.bib",
360+
"cite_by": "apalike",
361+
"current_citInitial": 1,
362+
"eqLabelWithNumbers": true,
363+
"eqNumInitial": 1,
364+
"hotkeys": {
365+
"equation": "Ctrl-E",
366+
"itemize": "Ctrl-I"
367+
},
368+
"labels_anchors": false,
369+
"latex_user_defs": false,
370+
"report_style_numbering": false,
371+
"user_envs_cfg": false
372+
},
373+
"nbTranslate": {
374+
"displayLangs": [
375+
"*"
376+
],
377+
"hotkey": "alt-t",
378+
"langInMainMenu": true,
379+
"sourceLang": "en",
380+
"targetLang": "fr",
381+
"useGoogleTranslate": true
353382
},
354383
"toc": {
355384
"base_numbering": 1,
@@ -363,6 +392,35 @@
363392
"toc_position": {},
364393
"toc_section_display": true,
365394
"toc_window_display": false
395+
},
396+
"varInspector": {
397+
"cols": {
398+
"lenName": 16,
399+
"lenType": 16,
400+
"lenVar": 40
401+
},
402+
"kernels_config": {
403+
"python": {
404+
"delete_cmd_postfix": "",
405+
"delete_cmd_prefix": "del ",
406+
"library": "var_list.py",
407+
"varRefreshCmd": "print(var_dic_list())"
408+
},
409+
"r": {
410+
"delete_cmd_postfix": ") ",
411+
"delete_cmd_prefix": "rm(",
412+
"library": "var_list.r",
413+
"varRefreshCmd": "cat(var_dic_list()) "
414+
}
415+
},
416+
"types_to_exclude": [
417+
"module",
418+
"function",
419+
"builtin_function_or_method",
420+
"instance",
421+
"_Feature"
422+
],
423+
"window_display": false
366424
}
367425
},
368426
"nbformat": 4,

examples/region_optimal.ipynb

Lines changed: 1363 additions & 0 deletions
Large diffs are not rendered by default.

examples/region_qrModified.ipynb

Lines changed: 1487 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)