From 96aa5ca9db6796508bcd19db65cb671049436cbb Mon Sep 17 00:00:00 2001 From: Paul-Walcher <paulwalcher12@gmail.com> Date: Tue, 11 Jun 2024 09:06:06 +0200 Subject: [PATCH] Revert "Renamed Square to Rectangle in RectangleScroll and RectangleType" This reverts commit 8acd9e9c6bc55fb5025ecd8f40ce2fe0a870e973. --- DOC/create_fact.md | 6 ------ source/DefaultSituationSpace.mmt | 2 +- source/MetaTheories.mmt | 2 +- .../{RectangleScroll.mmt => SquareScroll.mmt} | 18 +++++++++--------- .../{RectangleType.mmt => SquareType.mmt} | 6 +++--- 5 files changed, 14 insertions(+), 20 deletions(-) rename source/Scrolls/{RectangleScroll.mmt => SquareScroll.mmt} (80%) rename source/Scrolls/{RectangleType.mmt => SquareType.mmt} (53%) diff --git a/DOC/create_fact.md b/DOC/create_fact.md index 736b09e..eb82985 100644 --- a/DOC/create_fact.md +++ b/DOC/create_fact.md @@ -34,12 +34,6 @@ 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 - in OMS_TO_TYPE add a line like: - { - ObjectType, - typeof(ObjectFact) - }, - 3. Then, in Assets\Scripts\InteractionEngine\FactHandling\Facts\Fact.cs diff --git a/source/DefaultSituationSpace.mmt b/source/DefaultSituationSpace.mmt index 6e811f7..40f028c 100644 --- a/source/DefaultSituationSpace.mmt +++ b/source/DefaultSituationSpace.mmt @@ -27,7 +27,7 @@ theory DefaultSituationSpace = include ?CircleAreaScroll ♠include ?ConeVolumeScroll ♠include ?TruncatedConeVolumeScroll ♠- include ?RectangleScroll ♠+ include ?SquareScroll ♠diff --git a/source/MetaTheories.mmt b/source/MetaTheories.mmt index 91c3e43..f46f039 100644 --- a/source/MetaTheories.mmt +++ b/source/MetaTheories.mmt @@ -335,7 +335,7 @@ theory FrameITTheories = theory FrameworldMeta = include ?MetaAnnotations ♠include ?FrameITTheories ♠- include ?RectangleType ♠+ include ?SquareType ♠// include ☞http://mathhub.info/MitM/core/arithmetics?RealArithmetics ♠diff --git a/source/Scrolls/RectangleScroll.mmt b/source/Scrolls/SquareScroll.mmt similarity index 80% rename from source/Scrolls/RectangleScroll.mmt rename to source/Scrolls/SquareScroll.mmt index 6cd41ff..ea84c98 100644 --- a/source/Scrolls/RectangleScroll.mmt +++ b/source/Scrolls/SquareScroll.mmt @@ -6,9 +6,9 @@ namespace http://mathhub.info/FrameIT/frameworld ⚠fixmeta ?FrameworldMeta ⚠-theory RectangleScroll = - meta ?MetaAnnotations?problemTheory ?RectangleScroll/Problem ♠- meta ?MetaAnnotations?solutionTheory ?RectangleScroll/Solution ♠+theory SquareScroll = + meta ?MetaAnnotations?problemTheory ?SquareScroll/Problem ♠+ meta ?MetaAnnotations?solutionTheory ?SquareScroll/Solution ♠theory Problem = A: point ☠meta ?MetaAnnotations?label "A" @@ -43,14 +43,14 @@ theory RectangleScroll = ⚠theory Solution = - include ?RectangleScroll/Problem ♠- meta ?MetaAnnotations?label "Rectangle" ♠+ include ?SquareScroll/Problem ♠+ meta ?MetaAnnotations?label "Square" ♠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." ♠- ConstructedRectangle : Rectangle - ☠= RectangleCons A B C - ☠meta ?MetaAnnotations?label s"Rectangle" - ☠meta ?MetaAnnotations?description s"The constructed Rectangle." + ConstructedSquare : Square + ☠= SquareCons A B C + ☠meta ?MetaAnnotations?label s"Square" + ☠meta ?MetaAnnotations?description s"The constructed Square." ♠⚠⚠\ No newline at end of file diff --git a/source/Scrolls/RectangleType.mmt b/source/Scrolls/SquareType.mmt similarity index 53% rename from source/Scrolls/RectangleType.mmt rename to source/Scrolls/SquareType.mmt index becda19..aa6fb72 100644 --- a/source/Scrolls/RectangleType.mmt +++ b/source/Scrolls/SquareType.mmt @@ -1,12 +1,12 @@ namespace http://mathhub.info/FrameIT/frameworld ⚠fixmeta ur:?LF ⚠-theory RectangleType = +theory SquareType = include ☞http://mathhub.info/MitM/core/geometry?3DGeometry ♠include ?FrameITBasics ♠- rectangleType : type ☠# Rectangle ♠- rectangleCons : point ⟶ point ⟶ point ⟶ Rectangle ☠# RectangleCons 1 2 3 ♠+ squareType : type ☠# Square ♠+ squareCons : point ⟶ point ⟶ point ⟶ Square ☠# SquareCons 1 2 3 ♠⚠\ No newline at end of file -- GitLab