-
Notifications
You must be signed in to change notification settings - Fork 11
adding some more mathematical shapes #187
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
77 commits
Select commit
Hold shift + click to select a range
4d5bf5a
adding some more mathematical shapes
debfad1
Create square.schema.tpl.json
3c8d158
Create kite.schema.tpl.json
6f5e961
Create parallelogram.schema.tpl.json
4a44a0e
Create rhombus.schema.tpl.json
31fa0de
Update square.schema.tpl.json
lzehl e87f904
Create triangle.schema.tpl.json
lzehl 833f886
Update square.schema.tpl.json
lzehl 6089dd9
Update triangle.schema.tpl.json
lzehl 44acbeb
Update rectangle.schema.tpl.json
lzehl ed099ab
Create rightTriangle.schema.tpl.json
lzehl 8a137c2
Update triangle.schema.tpl.json
lzehl 9bab91f
Update parallelogram.schema.tpl.json
lzehl d6fa4b1
Create trapezoid.schema.tpl.json
lzehl 7052abe
Update parallelogram.schema.tpl.json
lzehl 95c6332
Update parallelogram.schema.tpl.json
lzehl f91d4cc
Update trapezoid.schema.tpl.json
lzehl a70c0c2
Update rhombus.schema.tpl.json
lzehl 31e5fea
Update triangle.schema.tpl.json
lzehl 7dbbcb3
Update rectangle.schema.tpl.json
lzehl 6c68d82
Update square.schema.tpl.json
lzehl b38e668
Update rectangle.schema.tpl.json
lzehl 14a0902
Update trapezoid.schema.tpl.json
lzehl a7e9e9a
Update rightTriangle.schema.tpl.json
lzehl 343aeb7
Update parallelogram.schema.tpl.json
lzehl f01334c
Update kite.schema.tpl.json
lzehl 3751c45
Update rhombus.schema.tpl.json
lzehl 34b44a6
Update trapezoid.schema.tpl.json
lzehl 7deccdd
Update sphere.schema.tpl.json
lzehl 5f7054a
Update parallelogram.schema.tpl.json
lzehl 1a164d1
Update circle.schema.tpl.json
lzehl 55cffb0
Update kite.schema.tpl.json
lzehl 0043d85
Update ellipse.schema.tpl.json
lzehl 21b6a5e
Create regularPolygon.schema.tpl.json
lzehl d04c9fe
Create circularSector.schema.tpl.json
lzehl c6b3ed2
Create spheroid.schema.tpl.json
lzehl 6565af5
Update triangle.schema.tpl.json
lzehl 7a3beb8
Update triangle.schema.tpl.json
lzehl ebbc26c
Update trapezoid.schema.tpl.json
lzehl a53ef0c
Update square.schema.tpl.json
lzehl 308b064
Update rightTriangle.schema.tpl.json
lzehl 9c7dcb2
Update regularPolygon.schema.tpl.json
lzehl 4e78616
Update parallelogram.schema.tpl.json
lzehl ba540fc
Update kite.schema.tpl.json
lzehl 866feae
Update kite.schema.tpl.json
lzehl 76e1db3
Create ellipsoid.schema.tpl.json
lzehl 3b5db5a
Create cube.schema.tpl.json
lzehl 23e1c8c
Create cuboid.schema.tpl.json
lzehl 9e2d5ff
Create squarePyramid.schema.tpl.json
lzehl be995f5
Create rectangularPyramid.schema.tpl.json
lzehl ad80843
Create rectangularFrustum.schema.tpl.json
lzehl 40eb3a0
Create cylinder.schema.tpl.json
lzehl f854094
Create cone.schema.tpl.json
lzehl 68dd187
Update circle.schema.tpl.json
lzehl 8e5379c
Update circularSector.schema.tpl.json
lzehl bad20b5
Update cone.schema.tpl.json
lzehl 56d2da6
Update ellipse.schema.tpl.json
lzehl 6ec4273
Update rectangle.schema.tpl.json
lzehl acb8111
fixed all namespace errors
lzehl d610e4b
updating props for rectangle and ellipse
lzehl 604e327
text
lzehl dd94b91
final conflict resolution
lzehl bfdf7ab
Update cone.schema.tpl.json
lzehl 2453082
added missing triangle types and corrected properties and instructions
lzehl 9e6bea4
started cleanup of 3d shapes
lzehl 73d9537
fixed validation errors
lzehl 403d1c8
fixed category to singular
lzehl a8c877f
completed categories and fixed indentation
lzehl e109092
selection of 3d shapes added
lzehl 7633861
fixed required props in cone
lzehl 1baed68
harmonizing and fixing stuff
lzehl a03e656
fixing validation errors
lzehl f917cca
fixing validation errors - missed one
lzehl 5e48918
fixing wrong category
lzehl 8cfbae2
Update kite.schema.tpl.json
lzehl 5a75690
simplification of 3D spaces
lzehl ef9981a
Apply suggestion from @Raphael-Gazzotti
lzehl 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
25 changes: 25 additions & 0 deletions
25
schemas/mathematicalShape/centroidalPyramid.schema.tpl.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 @@ | ||
| { | ||
| "_type": "sands:CentroidalPyramid", | ||
| "_categories": [ | ||
| "mathematicalShape", | ||
| "mathematical3DShape" | ||
| ], | ||
| "required": [ | ||
| "apexBaseDistance", | ||
| "baseShape" | ||
| ], | ||
| "properties": { | ||
| "apexBaseDistance": { | ||
| "_instruction": "Enter the perpendicular distance from the centroid of the base plane to the apex of this centroidal pyramid.", | ||
| "_embeddedTypes": [ | ||
| "core:QuantitativeValue" | ||
| ] | ||
| }, | ||
| "baseShape": { | ||
| "_instruction": "Enter the two-dimensional base shape of this centroidal pyramid.", | ||
| "_embeddedCategories": [ | ||
| "simplePolygon" | ||
| ] | ||
| } | ||
| } | ||
| } |
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 @@ | ||
| { | ||
| "_type": "sands:CircularSector", | ||
| "_categories": [ | ||
| "mathematicalShape", | ||
| "mathematical2DShape" | ||
| ], | ||
| "required": [ | ||
| "centralAngle", | ||
| "radius" | ||
| ], | ||
| "properties": { | ||
| "centralAngle": { | ||
| "_instruction": "Enter the central angle of this circular sector.", | ||
| "_embeddedTypes": [ | ||
| "core:QuantitativeValue" | ||
| ] | ||
| }, | ||
| "radius": { | ||
| "_instruction": "Enter the radius of this circular sector.", | ||
| "_embeddedTypes": [ | ||
| "core:QuantitativeValue" | ||
| ] | ||
| } | ||
| } | ||
| } |
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,18 @@ | ||
| { | ||
| "_type": "sands:Cube", | ||
| "_categories": [ | ||
| "mathematicalShape", | ||
| "mathematical3DShape" | ||
| ], | ||
| "required": [ | ||
| "sideLength" | ||
| ], | ||
| "properties": { | ||
| "sideLength": { | ||
| "_instruction": "Enter the common length of the sides of this cube.", | ||
| "_embeddedTypes": [ | ||
| "core:QuantitativeValue" | ||
| ] | ||
| } | ||
| } | ||
| } |
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,32 @@ | ||
| { | ||
| "_type": "sands:Ellipsoid", | ||
| "_categories": [ | ||
| "mathematicalShape", | ||
| "mathematical3DShape" | ||
| ], | ||
| "required": [ | ||
| "intermediateDiameter", | ||
| "majorDiameter", | ||
| "minorDiameter" | ||
| ], | ||
| "properties": { | ||
| "intermediateDiameter": { | ||
| "_instruction": "Enter the intermediate diameter of this ellipsoid.", | ||
| "_embeddedTypes": [ | ||
| "core:QuantitativeValue" | ||
| ] | ||
| }, | ||
| "majorDiameter": { | ||
| "_instruction": "Enter the major diameter of this ellipsoid.", | ||
| "_embeddedTypes": [ | ||
| "core:QuantitativeValue" | ||
| ] | ||
| }, | ||
| "minorDiameter": { | ||
| "_instruction": "Enter the minor diameter of this ellipsoid.", | ||
| "_embeddedTypes": [ | ||
| "core:QuantitativeValue" | ||
| ] | ||
| } | ||
| } | ||
| } |
19 changes: 19 additions & 0 deletions
19
schemas/mathematicalShape/equilateralTriangle.schema.tpl.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 @@ | ||
| { | ||
| "_type": "sands:EquilateralTriangle", | ||
| "_categories": [ | ||
| "mathematicalShape", | ||
| "mathematical2DShape", | ||
| "simplePolygon" | ||
| ], | ||
| "required": [ | ||
| "sideLength" | ||
| ], | ||
| "properties": { | ||
| "sideLength": { | ||
| "_instruction": "Enter the common length of the sides of this equilateral triangle.", | ||
| "_embeddedTypes": [ | ||
| "core:QuantitativeValue" | ||
| ] | ||
| } | ||
| } | ||
| } |
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 @@ | ||
| { | ||
| "_type": "sands:Frustum", | ||
| "_categories": [ | ||
| "mathematicalShape", | ||
| "mathematical3DShape" | ||
| ], | ||
| "required": [ | ||
| "baseDistance", | ||
| "majorBaseShape", | ||
| "minorBaseScale" | ||
| ], | ||
| "properties": { | ||
| "baseDistance": { | ||
| "_instruction": "Enter the perpendicular distance between the centered major and minor base planes of this frustum.", | ||
| "_embeddedTypes": [ | ||
| "core:QuantitativeValue" | ||
| ] | ||
| }, | ||
| "majorBaseShape": { | ||
| "_instruction": "Enter the major two-dimensional base shape of this frustum.", | ||
| "_embeddedCategories": [ | ||
| "mathematical2DShape" | ||
| ] | ||
| }, | ||
| "minorBaseScale": { | ||
| "type": "float", | ||
| "exclusiveMinimum": 0, | ||
| "exclusiveMaximum": 1, | ||
| "_instruction": "Enter the ratio of the smaller to the larger base size of this frustum." | ||
| } | ||
| } | ||
| } |
26 changes: 26 additions & 0 deletions
26
schemas/mathematicalShape/isoscelesTriangle.schema.tpl.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,26 @@ | ||
| { | ||
| "_type": "sands:IsoscelesTriangle", | ||
| "_categories": [ | ||
| "mathematicalShape", | ||
| "mathematical2DShape", | ||
| "simplePolygon" | ||
| ], | ||
| "required": [ | ||
| "apexAngle", | ||
| "legLength" | ||
| ], | ||
| "properties": { | ||
| "apexAngle": { | ||
| "_instruction": "Enter the angle at the apex between the two equal sides of this isosceles triangle.", | ||
| "_embeddedTypes": [ | ||
| "core:QuantitativeValue" | ||
| ] | ||
| }, | ||
| "legLength": { | ||
| "_instruction": "Enter the common length of the two equal sides meeting at the apex of this isosceles triangle.", | ||
| "_embeddedTypes": [ | ||
| "core:QuantitativeValue" | ||
| ] | ||
| } | ||
| } | ||
| } |
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 @@ | ||
| { | ||
| "_type": "sands:Kite", | ||
| "_categories": [ | ||
| "mathematicalShape", | ||
| "mathematical2DShape", | ||
| "simplePolygon" | ||
| ], | ||
| "required": [ | ||
| "legLengths", | ||
| "symmetryDiagonalLength" | ||
| ], | ||
| "properties": { | ||
| "legLengths": { | ||
| "type": "array", | ||
| "minItems": 2, | ||
| "maxItems": 2, | ||
| "_instruction": "Enter the two common leg lengths (for the shorter and longer leg pairs) of this kite.", | ||
| "_embeddedTypes": [ | ||
| "core:QuantitativeValue" | ||
| ] | ||
| }, | ||
|
lzehl marked this conversation as resolved.
|
||
| "symmetryDiagonalLength": { | ||
| "_instruction": "Enter the length of the symmetry diagonal of this kite.", | ||
| "_embeddedTypes": [ | ||
| "core:QuantitativeValue" | ||
| ] | ||
| } | ||
| } | ||
| } | ||
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,34 @@ | ||
| { | ||
| "_type": "sands:Parallelogram", | ||
| "_categories": [ | ||
| "mathematicalShape", | ||
| "mathematical2DShape", | ||
| "simplePolygon" | ||
| ], | ||
| "required": [ | ||
| "baseDistance", | ||
| "baseLength", | ||
| "interiorAngle" | ||
| ], | ||
| "properties": { | ||
| "baseDistance": { | ||
| "_instruction": "Enter the perpendicular distance between the parallel lines of the base of this parallelogram.", | ||
| "_embeddedTypes": [ | ||
| "core:QuantitativeValue" | ||
| ] | ||
| }, | ||
| "baseLength": { | ||
| "_instruction": "Enter the uniform length of the bottom and top sides (the base) of this parallelogram.", | ||
| "_embeddedTypes": [ | ||
| "core:QuantitativeValue" | ||
| ] | ||
| }, | ||
|
|
||
| "interiorAngle": { | ||
| "_instruction": "Enter an interior angle between the base and an adjacent side of this parallelogram.", | ||
| "_embeddedTypes": [ | ||
| "core:QuantitativeValue" | ||
| ] | ||
| } | ||
| } | ||
| } |
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
|
Raphael-Gazzotti marked this conversation as resolved.
|
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 @@ | ||
| { | ||
| "_type": "sands:RegularPolygon", | ||
| "_categories": [ | ||
| "mathematicalShape", | ||
| "mathematical2DShape", | ||
| "simplePolygon" | ||
| ], | ||
| "required": [ | ||
| "circumradius", | ||
| "numberOfSides" | ||
| ], | ||
| "properties": { | ||
| "circumradius": { | ||
| "_instruction": "Enter the common distance from the center to a vertex of this regular polygon.", | ||
| "_embeddedTypes": [ | ||
| "core:QuantitativeValue" | ||
| ] | ||
| }, | ||
| "numberOfSides": { | ||
| "type": "integer", | ||
| "minimum": 3, | ||
| "_instruction": "Enter the number of sides of this regular polygon." | ||
| } | ||
| } | ||
| } |
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,22 @@ | ||
| { | ||
| "_type": "sands:Rhombus", | ||
| "_categories": [ | ||
| "mathematicalShape", | ||
| "mathematical2DShape", | ||
| "simplePolygon" | ||
| ], | ||
| "required": [ | ||
| "diagonalLengths" | ||
| ], | ||
| "properties": { | ||
| "diagonalLengths": { | ||
| "type": "array", | ||
| "minItems": 2, | ||
| "maxItems": 2, | ||
| "_instruction": "Enter the lengths of the two perpendicular diagonals of this rhombus.", | ||
| "_embeddedTypes": [ | ||
| "core:QuantitativeValue" | ||
| ] | ||
| } | ||
| } | ||
| } |
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,26 @@ | ||
| { | ||
| "_type": "sands:RightCone", | ||
| "_categories": [ | ||
| "mathematicalShape", | ||
| "mathematical3DShape" | ||
| ], | ||
| "required": [ | ||
| "apexBaseDistance", | ||
| "baseShape" | ||
| ], | ||
| "properties": { | ||
| "apexBaseDistance": { | ||
| "_instruction": "Enter the perpendicular distance from the center of the base plane to the apex of this right cone.", | ||
| "_embeddedTypes": [ | ||
| "core:QuantitativeValue" | ||
| ] | ||
| }, | ||
| "baseShape": { | ||
| "_instruction": "Enter the two-dimensional elliptic base shape of this right cone.", | ||
| "_embeddedTypes": [ | ||
| "sands:Circle", | ||
| "sands:Ellipse" | ||
| ] | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.