diff --git a/beaker-notebooks/Embedding.bkr b/beaker-notebooks/Embedding.bkr
index 0f0b5700a9539b724e2a294aaf062fe46ba2b536..b8fa97cffcbc5c72dfd10593a74f33390a91212a 100644
--- a/beaker-notebooks/Embedding.bkr
+++ b/beaker-notebooks/Embedding.bkr
@@ -55,7 +55,7 @@
"<label style=\"text-align: left; color: #20335d; font-weight: 900; font-size: 18pt; padding-top: 2em;\">",
" Visualizing material-similarity:</label><br/><label style=\"color: #20335d;font-weight: 900; font-size: 15pt;\"> Octet-binary zincblende vs. rocksalt semiconductors</label>",
" </p>",
- " <p style=\"font-size: 15px;\">Angelo Ziletti, Ankit Kariryaa, Emre Ahmetcik, Fawzi Mohamed, Luca Ghiringhelli, and Matthias Scheffler <span style=\"font-size: smaller;\">[version 2017-02-03]</span></p>",
+ " <p style=\"font-size: 15px;\">Angelo Ziletti, Ankit Kariryaa, Emre Ahmetcik, Fawzi Mohamed, Luca Ghiringhelli, and Matthias Scheffler <span style=\"font-size: smaller;\">[version 2017-16-03]</span></p>",
" ",
"<div style=\"padding-top: 1em;\">"
],
@@ -66,7 +66,7 @@
"result": {
"type": "BeakerDisplay",
"innertype": "Html",
- "object": "<script>\nvar beaker = bkHelper.getBeakerObject().beakerObj;\n</script>\n<label style=\"text-align: left; color: #20335d; font-weight: 900; font-size: 18pt; padding-top: 2em;\">\n Visualizing material-similarity:</label><br><label style=\"color: #20335d;font-weight: 900; font-size: 15pt;\"> Octet-binary zincblende vs. rocksalt semiconductors</label>\n <p></p>\n <p style=\"font-size: 15px;\">Angelo Ziletti, Ankit Kariryaa, Emre Ahmetcik, Fawzi Mohamed, Luca Ghiringhelli, and Matthias Scheffler <span style=\"font-size: smaller;\">[version 2017-02-03]</span></p>\n \n<div style=\"padding-top: 1em;\"></div>"
+ "object": "<script>\nvar beaker = bkHelper.getBeakerObject().beakerObj;\n</script>\n<label style=\"text-align: left; color: #20335d; font-weight: 900; font-size: 18pt; padding-top: 2em;\">\n Visualizing material-similarity:</label><br><label style=\"color: #20335d;font-weight: 900; font-size: 15pt;\"> Octet-binary zincblende vs. rocksalt semiconductors</label>\n <p></p>\n <p style=\"font-size: 15px;\">Angelo Ziletti, Ankit Kariryaa, Emre Ahmetcik, Fawzi Mohamed, Luca Ghiringhelli, and Matthias Scheffler <span style=\"font-size: smaller;\">[version 2017-16-03]</span></p>\n \n<div style=\"padding-top: 1em;\"></div>"
},
"selectedType": "BeakerDisplay",
"elapsedTime": 0,
@@ -380,7 +380,7 @@
"innertype": "Html",
"object": "<script>\nvar beaker = bkHelper.getBeakerObject().beakerObj;\n</script>\n<script>\nvar run_lasso = function() {\n $(\"#lasso_result_button\").removeClass(\"active\").addClass(\"disabled\");\n getFeatures();\n getEmbedMethod();\n getStandardize();\n getUnits();\n beaker.evaluate(\"lasso_cell\"); // evaluate cells with tag \"lasso_cell\"\n // view_result()\n};\nvar reset_lasso = function(){\n beaker.evaluate(\"lasso_gui\");\n};\nvar getFeatures = function() {\n beaker.selected_feature_list = [];\n $('#lasso_features_select input:checkbox').each(function () {\n if(this.checked )\n beaker.selected_feature_list.push(this.value);\n });\n};\n \nvar getUnits = function() {\n beaker.units = $(\"#units_select\").val();\n};\n \nvar getEmbedMethod = function() {\n beaker.embed_method = \"pca\";\n $('#embed_method_selector input:radio').each(function () {\n if(this.checked )\n beaker.embed_method = this.value;\n });\n};\n \nvar getStandardize = function() {\n beaker.standardize = \"yes\";\n $('#standardize input:radio').each(function () {\n if(this.checked )\n beaker.standardize = this.value;\n });\n};\n \nbeaker.view_result = function(result_link) {\n// beaker.evaluate(\"lasso_viewer_result\").then(function(x) {\n $(\"#lasso_result_button\").attr(\"href\", result_link);\n// }); \n $(\"#lasso_result_button\").removeClass(\"disabled\").addClass(\"active\");\n}\n</script>\n<style type=\"text/css\">\n label {\n font-size: 18px;\n }\n .lasso_control{\n font-size: 18px;\n } \n.lasso_form_group input {\n width: 15px;\n height: 15px;\n padding: 0;\n margin:0;\n padding-right:5px; \n vertical-align: bottom;\n top: -1px;\n} \n .lasso_selection_description{\n padding: 10px 15px;\n }\n</style>\n<div class=\"lasso_control\">\n <div class=\"row\">\n <p class=\"lasso_selection_description\"><b>Primary features </b>\n (hover the mouse pointer over the feature names to see a full description):</p>\n <form id=\"lasso_features_select\">\n <div class=\"lasso_form_group\">\n <label class=\"col-xs-4 col-md-4 col-lg-3\"> <input value=\"atomic_ionization_potential\" checked=\"\" type=\"checkbox\"> <span title=\"Atomic ionization potential\"><i>IP</i> </span></label>\n <label class=\"col-xs-4 col-md-4 col-lg-3\"> <input value=\"atomic_electron_affinity\" checked=\"\" type=\"checkbox\"> <span title=\"Atomic electron affinity\"> <i>EA</i></span></label>\n <label class=\"col-xs-4 col-md-4 col-lg-3\"> <input value=\"atomic_homo\" type=\"checkbox\"> <span title=\"Energy of highest occupied molecular orbital\"><i>E</i> <sub>HOMO</sub></span> </label>\n <label class=\"col-xs-4 col-md-4 col-lg-2\"> <input value=\"atomic_lumo\" type=\"checkbox\"> <span title=\"Energy of lowest unoccupied molecular orbital\"> <i>E</i> <sub>LUMO</sub> </span> </label>\n \n <label class=\"col-xs-4 col-md-4 col-lg-3\"> <input value=\"atomic_rs_max\" checked=\"\" type=\"checkbox\"> <span title=\"Radius at which the radial probability density of the valence s orbital is maximum\"> <i>r</i><sub>s</sub> </span> </label>\n <label class=\"col-xs-4 col-md-4 col-lg-3\"> <input value=\"atomic_rp_max\" checked=\"\" type=\"checkbox\"> <span title=\"Radius at which the radial probability density of the valence p orbital is maximum\"> <i>r</i><sub>p</sub> </span> </label>\n <label class=\"col-xs-4 col-md-4 col-lg-3\"> <input value=\"atomic_rd_max\" checked=\"\" type=\"checkbox\"> <span title=\"Radius at which the radial probability density of the valence d orbital is maximum\"> <i>r</i><sub>d</sub> </span> </label>\n <label class=\"col-xs-4 col-md-4 col-lg-3\"> <input value=\"atomic_number\" type=\"checkbox\"> <span title=\"Atomic number\"> <i>Z</i> </span> </label>\n <label class=\"col-xs-4 col-md-4 col-lg-3\"> <input value=\"atomic_number_valence_electrons\" type=\"checkbox\"> <span title=\"Number of valence electrons\"> <i>Z</i><sub>val</sub> </span> </label>\n <label class=\"col-xs-4 col-md-4 col-lg-3\"> <input value=\"period\" type=\"checkbox\"> <span title=\"Period (in the periodic table)\"> <i>n</i> <sub>period</sub> </span> </label>\n <label class=\"col-xs-4 col-md-4 col-lg-3\"> <input value=\"atomic_r_by_2_dimer\" type=\"checkbox\"> <span title=\"Bond length of the dimer\"> <i>d</i> <sub>dimer</sub> </span> </label>\n <label class=\"col-xs-4 col-md-4 col-lg-3\"> <input value=\"atomic_electronic_binding_energy_dimer\" type=\"checkbox\"> <span title=\"Binding energy of the dimer\"> <i>E</i> <sub>b</sub> </span> </label>\n <label class=\"col-xs-4 col-md-4 col-lg-3\"> <input value=\"atomic_homo_lumo_diff\" type=\"checkbox\"> <span title=\"HOMO-LUMO gap of the dimer\"> Δ<i>E</i><sub>HL</sub> </span> </label>\n \n<!--- <label class =\"col-xs-4 col-md-4 col-lg-3\"> <input type=\"checkbox\" value=\"Es/sqrt(Zval)\" > \n <span title=\"Energy of the valence s orbital(s) divided by the square root of the number of valence electrons. [Phys. Rev. B 85, 104104 (2012)]\"> <i>E</i><sub>s</sub>/sqrt(<i>Z</i> <sub>val</sub>) </span> </label>\n <label class =\"col-xs-4 col-md-4 col-lg-3\"> <input type=\"checkbox\" value=\"Ep/sqrt(Zval)\" > \n <span title=\"Energy of the valence p orbital(s) divided by the square root of the number of valence electrons. [Phys. Rev. B 85, 104104 (2012)]\"> <i>E</i><sub>p</sub>/sqrt(<i>Z</i> <sub>val</sub>) </span> </label>\n--> \n </div>\n </form>\n </div> <!-- End of row-->\n \n <br>\n <div class=\"row\"> <!-- Start of row-->\n <p class=\"lasso_selection_description\"><b>Units of measurement: </b> \n <select id=\"units_select\">\n <option value=\"eV_angstrom\"> [energy]=eV; [length]=angstrom</option>\n <option value=\"J_m\"> [energy]=J; [length]=m</option>\n <option value=\"kcal/mol_angstrom\"> [energy]=kcal/mol; [length]=angstrom</option>\n </select> </p>\n </div><!-- End of row-->\n \n <br>\n <div class=\"row\"> <!-- Start of second row-->\n <div class=\"lasso_form_group\">\n <p class=\"lasso_selection_description\"><b>Embedding methods:</b> </p>\n <div id=\"embed_method_selector\">\n <label class=\"col-xs-4 col-md-4 col-lg-4\"><input name=\"inlineRadioOptions\" id=\"inlineRadio1\" value=\"pca\" checked=\"\" type=\"radio\"> Principal Compenent Analysis (PCA) [<a href=\"https://en.wikipedia.org/wiki/Principal_component_analysis\" target=\"_blank\">more info</a>]</label>\n <label class=\"col-xs-4 col-md-4 col-lg-4\"><input name=\"inlineRadioOptions\" id=\"inlineRadio2\" value=\"mds\" type=\"radio\"> Multidimensional scaling (MDS) [<a href=\"https://en.wikipedia.org/wiki/Multidimensional_scaling\" target=\"_blank\">more info</a>]</label>\n <label class=\"col-xs-4 col-md-4 col-lg-4\"><input name=\"inlineRadioOptions\" id=\"inlineRadio3\" value=\"tsne_pca\" type=\"radio\"> t-Distributed Stochastic Neighbor Embedding (t-SNE) [<a href=\"https://en.wikipedia.org/wiki/T-distributed_stochastic_neighbor_embedding\" target=\"_blank\">more info</a>]</label>\n </div> \n </div>\n </div><!-- End of row--> \n <div class=\"row\"> <!-- Start of second row-->\n <div class=\"lasso_form_group\">\n <p class=\"lasso_selection_description\"><b>Scale data to unit-variance:</b>\n (data are centered around the mean in any case) [<a href=\"https://en.wikipedia.org/wiki/Feature_scaling\" target=\"_blank\">more info</a>]</p>\n <div id=\"standardize\">\n <label class=\"col-xs-4 col-md-4 col-lg-4\"><input name=\"inlineRadioOptionsStandardize\" id=\"inlineRadio4\" value=\"True\" checked=\"\" type=\"radio\"> yes </label>\n <label class=\"col-xs-4 col-md-4 col-lg-4\"><input name=\"inlineRadioOptionsStandardize\" id=\"inlineRadio5\" value=\"False\" type=\"radio\"> no </label>\n </div> \n </div>\n </div><!-- End of row--> \n <br>\n\n<!-- <span title=''> <img src=\"http://images.clipartpanda.com/question-purzen_Icon_with_question_mark_Vector_Clipart.png\" style=\"height: 30px; width: 30px;\"> </span> -->\n <button class=\"btn btn-default\" onclick=\"run_lasso()\">RUN TWO-DIMENSIONAL EMBEDDING</button>\n <button class=\"btn btn-default\" onclick=\"reset_lasso()\">RESET</button>\n <label title=\"This button becomes active when the run is finished. By clicking it, an interactive structural-similarity plot will be opened\"> <a href=\"#\" target=\"_blank\" class=\"btn btn-primary disabled\" id=\"lasso_result_button\">View interactive 2D scatter plot</a> </label>\n</div> <!-- End of lasso_control -->\n"
},
- "height": 530
+ "height": 553
},
"evaluatorReader": true,
"lineCount": 137
@@ -394,7 +394,6 @@
"from IPython.core.display import HTML ",
"from nomad_sim.wrappers import get_json_list, calc_descriptor ",
"from nomad_sim.wrappers import calc_model, calc_embedding, plot",
- "#from nomad_sim.parsing_utils import read_gdb_7k",
"from nomad_sim.utils_crystals import create_supercell",
"from nomad_sim.utils_crystals import create_vacancies",
"from nomad_sim.utils_crystals import random_displace_atoms",
@@ -440,12 +439,12 @@
"selectedType": "BeakerDisplay",
"state": {},
"pluginName": "IPython",
- "shellId": "9E8C500268B34636A6638516475F2CC6",
+ "shellId": "DBE709AF38CB45F29ADDAF47FD4420DD",
"height": 103,
- "elapsedTime": 1091
+ "elapsedTime": 902
},
"evaluatorReader": true,
- "lineCount": 42,
+ "lineCount": 41,
"tags": "lasso_cell"
},
{
@@ -550,8 +549,8 @@
"state": {},
"selectedType": "Hidden",
"pluginName": "IPython",
- "shellId": "9E8C500268B34636A6638516475F2CC6",
- "elapsedTime": 457
+ "shellId": "DBE709AF38CB45F29ADDAF47FD4420DD",
+ "elapsedTime": 391
},
"evaluatorReader": true,
"lineCount": 89,
@@ -603,8 +602,8 @@
"state": {},
"selectedType": "Results",
"pluginName": "IPython",
- "shellId": "9E8C500268B34636A6638516475F2CC6",
- "elapsedTime": 14684,
+ "shellId": "DBE709AF38CB45F29ADDAF47FD4420DD",
+ "elapsedTime": 14863,
"height": 166
},
"evaluatorReader": true,
@@ -709,8 +708,8 @@
"state": {},
"selectedType": "Hidden",
"pluginName": "IPython",
- "shellId": "9E8C500268B34636A6638516475F2CC6",
- "elapsedTime": 471,
+ "shellId": "DBE709AF38CB45F29ADDAF47FD4420DD",
+ "elapsedTime": 431,
"height": 78
},
"evaluatorReader": true,
@@ -739,9 +738,9 @@
"state": {},
"selectedType": "Results",
"pluginName": "IPython",
- "shellId": "9E8C500268B34636A6638516475F2CC6",
+ "shellId": "DBE709AF38CB45F29ADDAF47FD4420DD",
"height": 78,
- "elapsedTime": 458
+ "elapsedTime": 412
},
"evaluatorReader": true,
"lineCount": 9,
@@ -776,9 +775,9 @@
"state": {},
"selectedType": "Results",
"pluginName": "IPython",
- "shellId": "9E8C500268B34636A6638516475F2CC6",
+ "shellId": "DBE709AF38CB45F29ADDAF47FD4420DD",
"height": 78,
- "elapsedTime": 7636
+ "elapsedTime": 8127
},
"evaluatorReader": true,
"lineCount": 16,
@@ -812,7 +811,7 @@
"pluginName": "JavaScript",
"state": {},
"hidden": true,
- "elapsedTime": 113,
+ "elapsedTime": 84,
"height": 51
},
"evaluatorReader": true,