-
Notifications
You must be signed in to change notification settings - Fork 4
added schema for material fingerprint primary descriptors #44
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.
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
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
b156325
added schema for material fingerprint primary descriptors
4859dd7
moved physical descriptors to elements schema
2f1b7b0
refactored JSON schema for material fingerprints
2c978f6
removed fingerprints from job and added to materials
43689b6
cleanup
12894d8
refactored material fingerprint schema
425e471
cleanup and refactoring
9f7d83b
cleanup and refactoring
8fa82a7
Cleanups and renaming
timurbazhirov d42df91
Merge branch 'epic/SOF-2008' into feature/SOF-2168
timurbazhirov File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| { | ||
| "primary": [ | ||
| { | ||
| "...": "include(fingerprint/primary.json)" | ||
| } | ||
| ], | ||
| "secondary": [ | ||
| { | ||
| "...": "include(characteristic.json)" | ||
| } | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "type": "compound-specific", | ||
| "subtype": "numeric", | ||
| "category": "stoichiometric", | ||
| "name": "p_norms", | ||
| "...": "include(primary/p_norms.json)" | ||
| } |
21 changes: 21 additions & 0 deletions
21
example/material/fingerprint/primary/compound_specific_array.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "name": "p_norms", | ||
| "data": [ | ||
| { | ||
| "name": "p03", | ||
| "value": 0.693 | ||
| }, | ||
| { | ||
| "name": "p05", | ||
| "value": 0.671 | ||
| }, | ||
| { | ||
| "name": "p07", | ||
| "value": 0.667 | ||
| }, | ||
| { | ||
| "name": "p09", | ||
| "value": 0.667 | ||
| } | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "...": "include(compound_specific_array.json)" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "...": "include(atomic_data.json)" | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "name": "lattice_bravais", | ||
| "type": "CUB", | ||
| "name": "lattice_bravais", | ||
| "a": 5.14, | ||
| "b": 5.14, | ||
| "c": 5.14, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-04/schema#", | ||
| "title": "material fingerprint schema", | ||
| "description": "collection of descriptors with information about materials structure, composition and characteristics required for performing advanced ML tasks", | ||
| "properties": { | ||
| "primary": { | ||
| "type": "array", | ||
| "description": "descriptors related to structure, stoichiometry and physical reference data of materials. Calculated on-the-fly ", | ||
| "items": { | ||
| "$ref": "file:fingerprint/primary.json" | ||
| } | ||
| }, | ||
| "secondary": { | ||
| "type": "array", | ||
| "description": "characteristic properties", | ||
| "items": { | ||
| "$ref": "file:characteristic.json" | ||
| } | ||
| } | ||
| }, | ||
| "required": [ | ||
| "primary", | ||
| "secondary" | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-04/schema#", | ||
| "title": "primary descriptor category schema", | ||
| "description": "type/subtype each primary descriptor belongs to", | ||
| "properties": { | ||
| "type": { | ||
| "type": "string", | ||
| "enum": [ | ||
| "element-specific", | ||
| "compound-specific" | ||
| ] | ||
| }, | ||
| "subtype": { | ||
| "description": "type of descriptor, whether it is a number or category", | ||
| "type": "string", | ||
| "enum": [ | ||
| "numeric", | ||
| "nominal", | ||
| "ordinal" | ||
| ] | ||
| }, | ||
| "category": { | ||
| "type": "string", | ||
| "enum": [ | ||
| "chemical", | ||
| "stoichiometric", | ||
| "structural", | ||
| "electronic" | ||
| ] | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-04/schema#", | ||
| "title": "primary descriptors schema", | ||
| "description": "collection of stoichiometric, structural, physical, electronic and chemical", | ||
| "allOf": [ | ||
| { | ||
| "$ref": "file:_primary.json" | ||
| } | ||
| ], | ||
| "properties": { | ||
| "name": { | ||
| "description": "Name of the descriptor", | ||
| "type": "string", | ||
| "enum": [ | ||
| "local_environment", | ||
| "element_spin_state", | ||
| "valence_orbital_occupancy", | ||
| "p_norms", | ||
| "elemental_composition", | ||
| "crystal_cell_type", | ||
| "material_type", | ||
| "is_relaxed", | ||
| "avg_atom_volume" | ||
| ] | ||
| } | ||
| }, | ||
| "oneOf": [ | ||
| { | ||
| "$ref": "file:primary/local_environment.json" | ||
| }, | ||
| { | ||
| "$ref": "file:primary/element_spin_state.json" | ||
| }, | ||
| { | ||
| "$ref": "file:primary/valence_orbital_occupancy.json" | ||
| }, | ||
| { | ||
| "$ref": "file:primary/p_norms.json" | ||
| }, | ||
| { | ||
| "$ref": "file:primary/elemental_composition.json" | ||
| }, | ||
| { | ||
| "$ref": "file:primary/crystal_cell_type.json" | ||
| }, | ||
| { | ||
| "$ref": "file:primary/material_type.json" | ||
| }, | ||
| { | ||
| "$ref": "file:primary/is_relaxed.json" | ||
| }, | ||
| { | ||
| "$ref": "file:primary/avg_atom_volume.json" | ||
| } | ||
| ] | ||
| } |
19 changes: 19 additions & 0 deletions
19
schema/material/fingerprint/primary/_compound_specific.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-04/schema#", | ||
| "title": "compound specific descriptors schema", | ||
| "description": "applicable for nominal/ordinal/numeric value types", | ||
| "properties": { | ||
| "name": { | ||
| "description": "name of the descriptor", | ||
| "type": "string" | ||
| }, | ||
| "value": { | ||
| "description": "value of the descriptor", | ||
| "type": [ | ||
| "string", | ||
| "number", | ||
| "boolean" | ||
| ] | ||
| } | ||
| } | ||
| } |
27 changes: 27 additions & 0 deletions
27
schema/material/fingerprint/primary/_compound_specific_array.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-04/schema#", | ||
| "title": "compound-specific descriptor array schema", | ||
| "description": "multiple elements related to compound-specific descriptor. Example: p-norms", | ||
| "properties": { | ||
| "name": { | ||
| "description": "name of the descriptor", | ||
| "type": "string" | ||
| }, | ||
| "data": { | ||
| "description": "compound-specific descriptor data in an array", | ||
| "type": "array", | ||
| "items": { | ||
| "properties": { | ||
| "name": { | ||
| "description": "variable name", | ||
| "type": "string" | ||
| }, | ||
| "value": { | ||
| "description": "the value for the corresponding elemental property", | ||
| "type": "number" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
schema/material/fingerprint/primary/_element_specific.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-04/schema#", | ||
| "title": "element specific descriptors schema", | ||
| "description": "applicable for nominal/ordinal/numeric value types", | ||
| "properties": { | ||
| "elements": { | ||
| "description": "elements in a material and corresponding descriptor value", | ||
| "type": "array", | ||
| "items": { | ||
| "properties": { | ||
| "name": { | ||
| "description": "element symbol. Eg: Si", | ||
| "type": "string" | ||
| }, | ||
| "value": { | ||
| "description": "elemental property value", | ||
| "type": "string" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-04/schema#", | ||
| "title": "Structural descriptor - average volume per atom schema", | ||
| "description": "Total volume divided by number of atoms. Units: 1/Ang**3 ", | ||
| "allOf": [ | ||
| { | ||
| "ref": "_compound_specific.json" | ||
| } | ||
| ], | ||
| "properties": { | ||
| "name": { | ||
| "enum": [ | ||
| "avg_atom_volume" | ||
| ] | ||
| }, | ||
| "units": { | ||
| "type": "string", | ||
| "enum": [ | ||
| "1/angstrom^3" | ||
| ] | ||
| } | ||
| } | ||
| } |
25 changes: 25 additions & 0 deletions
25
schema/material/fingerprint/primary/crystal_cell_type.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-04/schema#", | ||
| "title": "Structural descriptor - representation of crsytal lattice", | ||
| "description": "primitive or conventional or supercell. Representation differentiates between two materials with similiar composition.", | ||
| "allOf": [ | ||
| { | ||
| "ref": "_compound_specific.json" | ||
| } | ||
| ], | ||
| "properties": { | ||
| "name": { | ||
| "enum": [ | ||
| "crystal_cell_type" | ||
| ] | ||
| }, | ||
| "value": { | ||
| "description": "cell representation", | ||
| "enum": [ | ||
| "primitive", | ||
| "supercell", | ||
| "conventional" | ||
| ] | ||
| } | ||
| } | ||
| } |
29 changes: 29 additions & 0 deletions
29
schema/material/fingerprint/primary/element_spin_state.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-04/schema#", | ||
| "title": "element spin state schema schema", | ||
| "description": "spin state of each element in the material", | ||
| "allOf": [ | ||
| { | ||
| "ref": "_element_specific.json" | ||
| } | ||
| ], | ||
| "properties": { | ||
| "name": { | ||
| "enum": [ | ||
| "element_spin_state" | ||
| ] | ||
| }, | ||
| "elements": { | ||
| "items": { | ||
| "value": { | ||
| "description": "high and low spin states correspond to states with max number of unpaired electrons with same spin and maximum number of paired spins respectively.", | ||
| "enum": [ | ||
| "high", | ||
| "intermediate", | ||
| "low" | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
17 changes: 17 additions & 0 deletions
17
schema/material/fingerprint/primary/elemental_composition.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-04/schema#", | ||
| "title": "stocihiometric descriptor, elemental composition schema", | ||
| "description": "composition of each element in the material", | ||
| "allOf": [ | ||
| { | ||
| "ref": "_compound_specific_array.json" | ||
| } | ||
| ], | ||
| "properties": { | ||
| "name": { | ||
| "enum": [ | ||
| "elemental_composition" | ||
| ] | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-04/schema#", | ||
| "title": "Structural descriptor - identifies whether a structure is at equilibrium", | ||
| "description": "Differentiates structures with similar composition but different characteristics", | ||
| "allOf": [ | ||
| { | ||
| "ref": "_compound_specific.json" | ||
| } | ||
| ], | ||
| "properties": { | ||
| "name": { | ||
| "enum": [ | ||
| "is_relaxed" | ||
| ] | ||
| }, | ||
| "value": { | ||
| "description": "Identifies a equilibrium structure.", | ||
| "type": "boolean" | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to discuss regarding elements schema.
Elements schema is to store elemental properties for a specific element. If I include atomic_data in elements json, I unnecessarily store the ids of the elements.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK