Skip to content

Joyce feedback #467

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

Merged
gusmith merged 14 commits into from
Nov 26, 2019
Merged

Joyce feedback #467

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8f33dd1
fixed links such they might work with nbsphinx
Nov 20, 2019
5690fbc
incorporated Joyce's feedback
Nov 21, 2019
02307dc
added pandas
Nov 21, 2019
44398ca
clarified output format
Nov 21, 2019
3b22f63
clarified where to find tutorials
Nov 21, 2019
2af440e
breaking up too long commands, delete project at the end
Nov 21, 2019
3f23804
back to the future
Nov 21, 2019
05392d6
sorted alphabetically
Nov 21, 2019
dc3205f
update to new sim scores format
Nov 21, 2019
d5f2980
remove mentioning the mask
Nov 24, 2019
d73aca8
show data and link to schema
Nov 24, 2019
0c35753
Merge branch 'develop' into joyce_feedback
wilko77 Nov 25, 2019
61ed450
Merge branch 'develop' into joyce_feedback
gusmith Nov 26, 2019
4b65731
It had been reverted back in a previous commit.
gusmith Nov 26, 2019
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
remove mentioning the mask
  • Loading branch information
wilko committed Nov 24, 2019
commit d5f29805ae9903ef0fb481aff370a39683caf7f3
50 changes: 25 additions & 25 deletions docs/tutorial/Similarity Scores.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Testing anonlink-entity-service hosted at http://0.0.0.0:8851\n"
"Testing anonlink-entity-service hosted at https://testing.es.data61.xyz\n"
]
}
],
Expand All @@ -101,7 +101,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"{\"project_count\": 1, \"rate\": 1, \"status\": \"ok\"}\r\n"
"{\"project_count\": 7082, \"rate\": 2845548, \"status\": \"ok\"}\r\n"
]
}
],
Expand Down Expand Up @@ -313,7 +313,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Overwriting /var/folders/mw/21b9jb5d1c9_3_z0dq7hpx1m00j_0b/T/tmpnwnrgmrz\n"
"Overwriting /var/folders/mw/21b9jb5d1c9_3_z0dq7hpx1m00j_0b/T/tmpgayhu51z\n"
]
}
],
Expand Down Expand Up @@ -555,17 +555,17 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Credentials will be saved in /var/folders/mw/21b9jb5d1c9_3_z0dq7hpx1m00j_0b/T/tmpb4_q6h6x\n",
"Credentials will be saved in /var/folders/mw/21b9jb5d1c9_3_z0dq7hpx1m00j_0b/T/tmp6fab0949\n",
"\u001b[31mProject created\u001b[0m\n"
]
},
{
"data": {
"text/plain": [
"{'project_id': 'a17e061f51d850298ff1e170f53ef157fc672cf086c5be1f',\n",
" 'result_token': 'b5379610146169560ef083763e6b097e38b4f7dca52032a4',\n",
" 'update_tokens': ['ed82d9aace5399f58c8bf749210ebef8aecb3ed60c7118ac',\n",
" 'b096e769b1c194000bf306be38be7cdbbcf9f69dac559e99']}"
"{'project_id': '224ac23b0c6ba6c661ade4082d0741fc94b9af3ebf09f9fd',\n",
" 'result_token': '331d33ba45f4b636aac944ba1ba52f2602a3f18bcff9ff25',\n",
" 'update_tokens': ['8826451e71fb0ea6f1b07d7e54264ab7477f4d97898f8ce5',\n",
" '122076e7ef37ccbedda55d028210d4e5a14d9441329ea492']}"
]
},
"execution_count": 8,
Expand Down Expand Up @@ -618,8 +618,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"\u001b[31mCLK data written to /var/folders/mw/21b9jb5d1c9_3_z0dq7hpx1m00j_0b/T/tmpz8n7ijbj.json\u001b[0m\n",
"\u001b[31mCLK data written to /var/folders/mw/21b9jb5d1c9_3_z0dq7hpx1m00j_0b/T/tmpuwp9igb6.json\u001b[0m\n"
"\u001b[31mCLK data written to /var/folders/mw/21b9jb5d1c9_3_z0dq7hpx1m00j_0b/T/tmp2s_mj16v.json\u001b[0m\n",
"\u001b[31mCLK data written to /var/folders/mw/21b9jb5d1c9_3_z0dq7hpx1m00j_0b/T/tmpvlxznb1y.json\u001b[0m\n"
]
}
],
Expand Down Expand Up @@ -746,7 +746,7 @@
"source": [
"## Results\n",
"\n",
"Now after some delay (depending on the size) we can fetch the mask.\n",
"Now after some delay (depending on the size) we can fetch the result.\n",
"This can be done with clkutil:\n",
"\n",
" !clkutil results --server \"{url}\" \\\n",
Expand Down Expand Up @@ -818,16 +818,16 @@
"name": "stdout",
"output_type": "stream",
"text": [
"[[0, 76], [1, 2345], 1.0]\n",
"[[0, 83], [1, 3439], 1.0]\n",
"[[0, 103], [1, 863], 1.0]\n",
"[[0, 154], [1, 2391], 1.0]\n",
"[[0, 177], [1, 4247], 1.0]\n",
"[[0, 192], [1, 1176], 1.0]\n",
"[[0, 270], [1, 4516], 1.0]\n",
"[[0, 312], [1, 1253], 1.0]\n",
"[[0, 407], [1, 3743], 1.0]\n",
"[[0, 670], [1, 3550], 1.0]\n"
"[76, 2345, 1.0]\n",
Copy link
Contributor

@gusmith gusmith Nov 21, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now we arrive at the problem with tutorials not compatible with the current branch: what is returned by the currently deployed service at testing.es.data61.xyz is not compatible with the version on this branch where the similarity score output type has changed. So to test your tutorial for the state of this branch, you have to build and deploy the entity service locally and test against (actually, no need to build as the docker images should already be on dockerhub for this branch).

"[83, 3439, 1.0]\n",
"[103, 863, 1.0]\n",
"[154, 2391, 1.0]\n",
"[177, 4247, 1.0]\n",
"[192, 1176, 1.0]\n",
"[270, 4516, 1.0]\n",
"[312, 1253, 1.0]\n",
"[407, 3743, 1.0]\n",
"[670, 3550, 1.0]\n"
]
}
],
Expand Down Expand Up @@ -977,7 +977,7 @@
"source": [
"scores_matches = []\n",
"scores_non_matches = []\n",
"for (_, a), (_, b), score in data:\n",
"for a, b, score in data:\n",
Copy link
Contributor

@gusmith gusmith Nov 26, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👎

" if score < 0.79:\n",
" continue\n",
" if (a, b) in true_matches:\n",
Expand Down Expand Up @@ -1071,13 +1071,13 @@
"pycharm": {
"stem_cell": {
"cell_type": "raw",
"source": [],
"metadata": {
"collapsed": false
},
"source": []
}
}
}
},
"nbformat": 4,
"nbformat_minor": 2
}
}