Skip to content
Snippets Groups Projects
Commit 96aa5ca9 authored by Paul-Walcher's avatar Paul-Walcher
Browse files

Revert "Renamed Square to Rectangle in RectangleScroll and RectangleType"

This reverts commit 8acd9e9c.
parent 8acd9e9c
No related branches found
No related tags found
No related merge requests found
...@@ -34,12 +34,6 @@ ...@@ -34,12 +34,6 @@
9. define: Defines(), which gives back a SOMDoc(MMTObject) of your class 9. define: Defines(), which gives back a SOMDoc(MMTObject) of your class
2. Add the MMT-fact you Implemented into Assets\Scripts\MMTServer\CommunicationProtocol\MMTConstants.cs 2. Add the MMT-fact you Implemented into Assets\Scripts\MMTServer\CommunicationProtocol\MMTConstants.cs
in OMS_TO_TYPE add a line like:
{
ObjectType,
typeof(ObjectFact)
},
3. Then, in Assets\Scripts\InteractionEngine\FactHandling\Facts\Fact.cs 3. Then, in Assets\Scripts\InteractionEngine\FactHandling\Facts\Fact.cs
......
...@@ -27,7 +27,7 @@ theory DefaultSituationSpace = ...@@ -27,7 +27,7 @@ theory DefaultSituationSpace =
include ?CircleAreaScroll ❙ include ?CircleAreaScroll ❙
include ?ConeVolumeScroll ❙ include ?ConeVolumeScroll ❙
include ?TruncatedConeVolumeScroll ❙ include ?TruncatedConeVolumeScroll ❙
include ?RectangleScroll ❙ include ?SquareScroll ❙
......
...@@ -335,7 +335,7 @@ theory FrameITTheories = ...@@ -335,7 +335,7 @@ theory FrameITTheories =
theory FrameworldMeta = theory FrameworldMeta =
include ?MetaAnnotations ❙ include ?MetaAnnotations ❙
include ?FrameITTheories ❙ include ?FrameITTheories ❙
include ?RectangleType ❙ include ?SquareType ❙
// include ☞http://mathhub.info/MitM/core/arithmetics?RealArithmetics ❙ // include ☞http://mathhub.info/MitM/core/arithmetics?RealArithmetics ❙
......
...@@ -6,9 +6,9 @@ namespace http://mathhub.info/FrameIT/frameworld ❚ ...@@ -6,9 +6,9 @@ namespace http://mathhub.info/FrameIT/frameworld ❚
fixmeta ?FrameworldMeta ❚ fixmeta ?FrameworldMeta ❚
theory RectangleScroll = theory SquareScroll =
meta ?MetaAnnotations?problemTheory ?RectangleScroll/Problem ❙ meta ?MetaAnnotations?problemTheory ?SquareScroll/Problem ❙
meta ?MetaAnnotations?solutionTheory ?RectangleScroll/Solution ❙ meta ?MetaAnnotations?solutionTheory ?SquareScroll/Solution ❙
theory Problem = theory Problem =
A: point A: point
❘ meta ?MetaAnnotations?label "A" ❘ meta ?MetaAnnotations?label "A"
...@@ -43,14 +43,14 @@ theory RectangleScroll = ...@@ -43,14 +43,14 @@ theory RectangleScroll =
theory Solution = theory Solution =
include ?RectangleScroll/Problem ❙ include ?SquareScroll/Problem ❙
meta ?MetaAnnotations?label "Rectangle" ❙ meta ?MetaAnnotations?label "Square" ❙
meta ?MetaAnnotations?description s"Scrolls that takes three points and given a right-angle fact between those points meta ?MetaAnnotations?description s"Scrolls that takes three points and given a right-angle fact between those points
and the distances from the first to the second and the second to the third point, constructs a rectangle." ❙ and the distances from the first to the second and the second to the third point, constructs a rectangle." ❙
ConstructedRectangle : Rectangle ConstructedSquare : Square
❘ = RectangleCons A B C ❘ = SquareCons A B C
❘ meta ?MetaAnnotations?label s"Rectangle" ❘ meta ?MetaAnnotations?label s"Square"
❘ meta ?MetaAnnotations?description s"The constructed Rectangle." ❘ meta ?MetaAnnotations?description s"The constructed Square."
\ No newline at end of file
namespace http://mathhub.info/FrameIT/frameworld ❚ namespace http://mathhub.info/FrameIT/frameworld ❚
fixmeta ur:?LF ❚ fixmeta ur:?LF ❚
theory RectangleType = theory SquareType =
include ☞http://mathhub.info/MitM/core/geometry?3DGeometry ❙ include ☞http://mathhub.info/MitM/core/geometry?3DGeometry ❙
include ?FrameITBasics ❙ include ?FrameITBasics ❙
rectangleType : type ❘ # Rectangle ❙ squareType : type ❘ # Square ❙
rectangleCons : point ⟶ point ⟶ point ⟶ Rectangle ❘ # RectangleCons 1 2 3 ❙ squareCons : point ⟶ point ⟶ point ⟶ Square ❘ # SquareCons 1 2 3 ❙
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment