Skip to content

Commit

Permalink
slight changes in gp.py and tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@MarcusMNoack
MarcusMNoack committed Oct 27, 2023
1 parent bf22fb9 commit acc708b
Show file tree
Hide file tree
Showing 11 changed files with 120,809 additions and 126,109 deletions.
123,138 changes: 60,244 additions & 62,894 deletions docs/source/examples/MultiTaskTest.ipynb
View file

Large diffs are not rendered by default.

74 changes: 39 additions & 35 deletions docs/source/examples/NonEuclideanInputSpaces.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": 8,
"id": "61c3f3bd",
"metadata": {},
"outputs": [],
"source": [
"#install the newest version of fvgp\n",
"#!pip install fvgp==4.0.7"
"#!pip install fvgp==4.0.9"
]
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": 9,
"id": "b5399565",
"metadata": {},
"outputs": [
Expand All @@ -48,51 +48,54 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": 10,
"id": "b91e69d3",
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"differential_evolution step 1: f(x)= 9.99831\n",
"differential_evolution step 2: f(x)= 9.99831\n",
"differential_evolution step 3: f(x)= 9.99831\n",
"differential_evolution step 4: f(x)= 9.55163\n",
"differential_evolution step 5: f(x)= 8.70714\n",
"differential_evolution step 6: f(x)= 8.70714\n",
"differential_evolution step 7: f(x)= 8.0772\n",
"differential_evolution step 8: f(x)= 8.0772\n",
"differential_evolution step 9: f(x)= 8.0772\n",
"differential_evolution step 10: f(x)= 8.06725\n",
"differential_evolution step 11: f(x)= 8.06725\n",
"differential_evolution step 12: f(x)= 8.06725\n",
"differential_evolution step 13: f(x)= 8.05648\n",
"differential_evolution step 14: f(x)= 8.05648\n",
"differential_evolution step 15: f(x)= 8.05648\n",
"differential_evolution step 16: f(x)= 8.04712\n",
"differential_evolution step 17: f(x)= 8.04712\n",
"differential_evolution step 18: f(x)= 8.04712\n",
"differential_evolution step 19: f(x)= 8.04504\n",
"differential_evolution step 20: f(x)= 8.04504\n",
"differential_evolution step 21: f(x)= 8.04502\n",
"differential_evolution step 22: f(x)= 8.04495\n",
"differential_evolution step 23: f(x)= 8.04489\n",
"differential_evolution step 24: f(x)= 8.04489\n",
"differential_evolution step 25: f(x)= 8.04489\n",
"differential_evolution step 26: f(x)= 8.04489\n",
"differential_evolution step 1: f(x)= 8.78181\n",
"differential_evolution step 2: f(x)= 8.78181\n",
"differential_evolution step 3: f(x)= 8.78181\n",
"differential_evolution step 4: f(x)= 8.78181\n",
"differential_evolution step 5: f(x)= 8.78181\n",
"differential_evolution step 6: f(x)= 8.78181\n",
"differential_evolution step 7: f(x)= 8.78181\n",
"differential_evolution step 8: f(x)= 8.70813\n",
"differential_evolution step 9: f(x)= 8.55749\n",
"differential_evolution step 10: f(x)= 8.45097\n",
"differential_evolution step 11: f(x)= 8.22163\n",
"differential_evolution step 12: f(x)= 8.06583\n",
"differential_evolution step 13: f(x)= 8.06583\n",
"differential_evolution step 14: f(x)= 8.06583\n",
"differential_evolution step 15: f(x)= 8.06583\n",
"differential_evolution step 16: f(x)= 8.06543\n",
"differential_evolution step 17: f(x)= 8.06543\n",
"differential_evolution step 18: f(x)= 8.0514\n",
"differential_evolution step 19: f(x)= 8.04614\n",
"differential_evolution step 20: f(x)= 8.04614\n",
"differential_evolution step 21: f(x)= 8.0449\n",
"differential_evolution step 22: f(x)= 8.0449\n",
"differential_evolution step 23: f(x)= 8.0449\n",
"differential_evolution step 24: f(x)= 8.0449\n",
"differential_evolution step 25: f(x)= 8.0449\n",
"differential_evolution step 26: f(x)= 8.0449\n",
"differential_evolution step 27: f(x)= 8.04489\n",
"differential_evolution step 28: f(x)= 8.04489\n",
"hyperparameters: [1.43383839 0.37769102]\n",
"prediction : [2.73997305]\n",
"uncertainty: [1.19742991]\n"
"differential_evolution step 29: f(x)= 8.04489\n",
"differential_evolution step 30: f(x)= 8.04489\n",
"differential_evolution step 31: f(x)= 8.04489\n",
"hyperparameters: [1.43486911 0.11327405]\n",
"prediction : [2.74]\n",
"uncertainty: [1.19786022]\n"
]
}
],
"source": [
"#making the x_data a set will allow us to put any objects or structures into it.\n",
"x_data = {'hello','world','this','is','fvgp'}\n",
"x_data = {('hello'),('world'),('this'),('is'),('fvgp')}\n",
"y_data = np.array([2.,1.9,1.8,3.0,5.])\n",
"\n",
"\n",
Expand Down Expand Up @@ -123,7 +126,8 @@
"\n",
"bounds = np.array([[0.001,100.],[0.001,100]])\n",
"\n",
"my_gp = GP(1, x_data,y_data,init_hyperparameters=np.ones((2)), hyperparameter_bounds=bounds, gp_kernel_function=kernel, info = True)\n",
"my_gp = GP(1, x_data,y_data,init_hyperparameters=np.ones((2)), \n",
" hyperparameter_bounds=bounds, gp_kernel_function=kernel, info = True)\n",
"my_gp.train()\n",
"\n",
"print(\"hyperparameters: \", my_gp.hyperparameters)\n",
Expand Down
96 changes: 56 additions & 40 deletions docs/source/examples/SingleTaskTest.ipynb
View file

Large diffs are not rendered by default.

118 changes: 45 additions & 73 deletions docs/source/examples/gp2ScaleTest.ipynb
View file

Large diffs are not rendered by default.

0 comments on commit acc708b

Please sign in to comment.