Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates to #236 to avoid breaking change to pybop.Optimisation #309

Merged
merged 13 commits into from
May 22, 2024
Merged

Updates to #236 to avoid breaking change to pybop.Optimisation #309

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c3f14ea
Splits Optimisation -> BaseOptimiser/Optimisation, enables two optimi…
BradyPlanden Apr 26, 2024
288d929
increase coverage
BradyPlanden Apr 26, 2024
e5093ce
Pass optimiser_kwargs though run()
NicolaCourtier Apr 26, 2024
e360fdf
Merge branch '236-scipy-kwargs' into 236b-scipy-kwargs
NicolaCourtier Apr 26, 2024
831c524
updt examples
BradyPlanden Apr 26, 2024
7e6f4fb
Merge branch '236-scipy-kwargs' into 236b-scipy-kwargs
BradyPlanden May 10, 2024
5698e4a
Converts DefaultOptimiser -> Optimisation
BradyPlanden May 10, 2024
5652597
split Optimisation and BaseOptimsier classes, loosen standalone cost …
BradyPlanden May 10, 2024
10d4df8
add incorrect attr test
BradyPlanden May 10, 2024
fca8968
fix: updt changelog entry, optimsation_interface notebook, review sug…
BradyPlanden May 15, 2024
ffbd9c7
fix: updt notebook state
BradyPlanden May 15, 2024
852d45f
Merge branch '236-scipy-kwargs' into 236b-scipy-kwargs
BradyPlanden May 22, 2024
e4ca965
Updt assertions, optimisation object name
BradyPlanden May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: updt notebook state
  • Loading branch information
@BradyPlanden
BradyPlanden committed May 15, 2024
commit ffbd9c70b3ccdcf93cee4224566c527ef4161e99
29 changes: 14 additions & 15 deletions examples/notebooks/optimiser_interface.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": 1,
"id": "dd0e1a20-1ba3-4ff5-8f6a-f9c6f25c2a4a",
"metadata": {
"execution": {
Expand Down Expand Up @@ -77,7 +77,7 @@
},
{
"cell_type": "code",
"execution_count": 7,
"execution_count": 2,
"id": "c346b106-99a9-46bc-8b5d-d330ed911660",
"metadata": {
"execution": {
Expand Down Expand Up @@ -145,7 +145,7 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": 3,
"id": "6244882e-11ad-4bfe-a512-f1c687a06a08",
"metadata": {
"execution": {
Expand Down Expand Up @@ -176,7 +176,7 @@
},
{
"cell_type": "code",
"execution_count": 9,
"execution_count": 4,
"id": "479fc846",
"metadata": {},
"outputs": [],
Expand All @@ -200,20 +200,19 @@
},
{
"cell_type": "code",
"execution_count": 13,
"execution_count": 5,
"id": "de56587e",
"metadata": {},
"outputs": [
{
"ename": "TypeError",
"evalue": "isinstance() arg 2 must be a type, a tuple of types, or a union",
"output_type": "error",
"traceback": [
"\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
"\u001b[0;31mTypeError\u001b[0m Traceback (most recent call last)",
"Cell \u001b[0;32mIn[13], line 1\u001b[0m\n\u001b[0;32m----> 1\u001b[0m \u001b[38;5;28;43misinstance\u001b[39;49m\u001b[43m(\u001b[49m\u001b[43moptim_one\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43moptim_two\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43moptimiser\u001b[49m\u001b[43m)\u001b[49m\n",
"\u001b[0;31mTypeError\u001b[0m: isinstance() arg 2 must be a type, a tuple of types, or a union"
]
"data": {
"text/plain": [
"True"
]
},
"execution_count": 5,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
Expand All @@ -230,7 +229,7 @@
},
{
"cell_type": "code",
"execution_count": 11,
"execution_count": 6,
"id": "66b74f3e",
"metadata": {},
"outputs": [
Expand Down
Loading