From 4e6be04e5acfc2f1c9aaf695f035551ecdb1be42 Mon Sep 17 00:00:00 2001 From: SimonvRoozendaalOrdina Date: Fri, 5 Jul 2024 09:33:01 +0200 Subject: [PATCH] eerste versie bug fix (error) --- ATLAS_file.json | 456 +---- .../FormalAmpersand/Documentation.adl | 4 +- out.adl | 72 +- out_generated_pop.json | 1608 +++++++++++++++++ src/Ampersand/ADL1/P2A_Converters.hs | 2 + src/Ampersand/ADL1/PrettyPrinters.hs | 2 + src/Ampersand/Commands/AtlasImport.hs | 2 + src/Ampersand/Core/A2P_Converters.hs | 10 + src/Ampersand/Core/ParseTree.hs | 6 + 9 files changed, 1685 insertions(+), 477 deletions(-) create mode 100644 out_generated_pop.json diff --git a/ATLAS_file.json b/ATLAS_file.json index 4098bd3c4..057ce9925 100644 --- a/ATLAS_file.json +++ b/ATLAS_file.json @@ -19,16 +19,16 @@ "type": "OBJECT" }, { - "name": "Concept1Ptn", + "name": "Concept3Ptn", "definition": [ - "this is the definition of CONCEPT Concept1Ptn in de PATTERN" + "this is the definition of CONCEPT Concept3Ptn in de PATTERN" ], "type": "OBJECT" }, { - "name": "Concept3Ptn", + "name": "Concept1Ptn", "definition": [ - "this is the definition of CONCEPT Concept3Ptn in de PATTERN" + "this is the definition of CONCEPT Concept1Ptn in de PATTERN" ], "type": "OBJECT" }, @@ -48,93 +48,78 @@ "meaning": [ "this is the meaning of the RULE Rule2Ptn, gedefineerd in de PATTERN" ], - "message": [] - }, - { - "name": "Rule1Ptn", - "formexp": "relatie1Ptn [Concept0Ptn*Concept0Ptn] |- relatie2Ptn [Concept0Ptn*Concept0Ptn]", - "meaning": [], - "message": [] + "message": [], + "violation": "VIOLATION (TXT \"Concept1Ptn \"\n ,SRC I[Concept1Ptn]\n ,TXT \" is in relatie6Ptn with Concept3Ptn \"\n ,TGT I[Concept3Ptn]\n ,TXT \" which is not part of the Concept2Ptn \"\n ,SRC I[Concept1Ptn];relatie4Ptn [Concept1Ptn*Concept2Ptn])", + "pairview": "PairView_279439b0-5db9-40a7-b12b-bf1b4a32be3a" } ], "relations": [ { - "relation": "relatie6Ptn", + "relation": "relatie1Ptn", "sign": { - "source": "Concept1Ptn", - "target": "Concept3Ptn" + "source": "Concept0Ptn", + "target": "Concept0Ptn" }, - "properties": [], + "properties": [ + "BIJ" + ], "meaning": [ - "this is the meaning of the RELATION relatie6Ptn, gedefineerd in de PATTERN" + "this is the meaning of the RELATION relatie1Ptn, gedefineerd in de PATTERN" ] }, { - "relation": "relatie5Ptn", + "relation": "relatie4Ptn", "sign": { - "source": "Concept3Ptn", + "source": "Concept1Ptn", "target": "Concept2Ptn" }, "properties": [], "meaning": [ - "this is the meaning of the RELATION relatie5Ptn, gedefineerd in de PATTERN" + "this is the meaning of the RELATION relatie4Ptn, gedefineerd in de PATTERN" ] }, { - "relation": "relatie3Ptn", + "relation": "relatie2Ptn", "sign": { "source": "Concept0Ptn", "target": "Concept0Ptn" }, "properties": [], "meaning": [ - "this is the meaning of the RELATION relatie3Ptn, gedefineerd in de PATTERN" - ] - }, - { - "relation": "relatie7Ptn", - "sign": { - "source": "Concept4Ptn", - "target": "Concept4Ptn" - }, - "properties": [], - "meaning": [ - "this is the meaning of the RELATION relatie7Ptn, gedefineerd in de PATTERN" + "this is the meaning of the RELATION relatie2Ptn, gedefineerd in de PATTERN" ] }, { - "relation": "relatie4Ptn", + "relation": "relatie6Ptn", "sign": { "source": "Concept1Ptn", - "target": "Concept2Ptn" + "target": "Concept3Ptn" }, - "properties": [ - "TOT" - ], + "properties": [], "meaning": [ - "this is the meaning of the RELATION relatie4Ptn, gedefineerd in de PATTERN" + "this is the meaning of the RELATION relatie6Ptn, gedefineerd in de PATTERN" ] }, { - "relation": "relatie1Ptn", + "relation": "relatie7Ptn", "sign": { - "source": "Concept0Ptn", - "target": "Concept0Ptn" + "source": "Concept4Ptn", + "target": "Concept3Ptn" }, "properties": [], "meaning": [ - "this is the meaning of the RELATION relatie1Ptn, gedefineerd in de PATTERN" + "this is the meaning of the RELATION relatie7Ptn, gedefineerd in de PATTERN" ] }, { - "relation": "relatie2Ptn", + "relation": "relatie5Ptn", "sign": { - "source": "Concept0Ptn", - "target": "Concept0Ptn" + "source": "Concept3Ptn", + "target": "Concept2Ptn" }, "properties": [], "meaning": [ - "this is the meaning of the RELATION relatie2Ptn, gedefineerd in de PATTERN" + "this is the meaning of the RELATION relatie5Ptn, gedefineerd in de PATTERN" ] } ], @@ -187,380 +172,19 @@ ], "conceptsCtx": [ { - "name": "Concept4Ctx", - "definition": [ - "this is the definition of CONCEPT Concept4Ctx in de CONTEXT" - ], - "type": "OBJECT" - }, - { - "name": "Concept1Ctx", - "definition": [ - "this is the definition of CONCEPT Concept1Ctx in de CONTEXT" - ], - "type": "OBJECT" - }, - { - "name": "Concept2Ctx", - "definition": [ - "this is the definition of CONCEPT Concept2Ctx in de CONTEXT" - ], - "type": "OBJECT" - }, - { - "name": "Concept3Ctx", - "definition": [ - "this is the definition of CONCEPT Concept3Ctx in de CONTEXT" - ], - "type": "OBJECT" - }, - { - "name": "Concept5Ctx", - "definition": [ - "this is the definition of CONCEPT Concept5Ctx in de CONTEXT" - ], + "name": "ONE", + "definition": [], "type": "OBJECT" } ], "representationsCtx": [], - "relationsCtx": [ - { - "relation": "originalFileName", - "sign": { - "source": "FileObject", - "target": "FileName" - }, - "properties": [ - "TOT", - "UNI" - ], - "meaning": [] - }, - { - "relation": "relatie4Ctx", - "sign": { - "source": "Concept1Ctx", - "target": "Concept2Ctx" - }, - "properties": [ - "TOT" - ], - "meaning": [ - "this is the meaning of the RELATION relatie4Ctx, gedefineerd in de CONTEXT" - ] - }, - { - "relation": "filePath", - "sign": { - "source": "FileObject", - "target": "FilePath" - }, - "properties": [ - "TOT", - "UNI" - ], - "meaning": [] - }, - { - "relation": "relatie1Ctx", - "sign": { - "source": "Concept0Ctx", - "target": "Concept0Ctx" - }, - "properties": [], - "meaning": [ - "this is the meaning of the RELATION relatie1Ctx, gedefineerd in de CONTEXT" - ] - }, - { - "relation": "relatie5Ctx", - "sign": { - "source": "Concept3Ctx", - "target": "Concept2Ctx" - }, - "properties": [], - "meaning": [ - "this is the meaning of the RELATION relatie5Ctx, gedefineerd in de CONTEXT" - ] - }, - { - "relation": "relatie7Ctx", - "sign": { - "source": "Concept4Ctx", - "target": "Concept4Ctx" - }, - "properties": [], - "meaning": [ - "this is the meaning of the RELATION relatie7Ctx, gedefineerd in de CONTEXT" - ] - }, - { - "relation": "relatie3Ctx", - "sign": { - "source": "Concept0Ctx", - "target": "Concept0Ctx" - }, - "properties": [], - "meaning": [ - "this is the meaning of the RELATION relatie3Ctx, gedefineerd in de CONTEXT" - ] - }, - { - "relation": "relatie2Ctx", - "sign": { - "source": "Concept0Ctx", - "target": "Concept0Ctx" - }, - "properties": [], - "meaning": [ - "this is the meaning of the RELATION relatie2Ctx, gedefineerd in de CONTEXT" - ] - }, - { - "relation": "relatie6Ctx", - "sign": { - "source": "Concept1Ctx", - "target": "Concept3Ctx" - }, - "properties": [], - "meaning": [ - "this is the meaning of the RELATION relatie6Ctx, gedefineerd in de CONTEXT" - ] - }, - { - "relation": "relatie7Ctx", - "sign": { - "source": "Concept5Ctx", - "target": "Concept5Ctx" - }, - "properties": [], - "meaning": [] - } - ], - "rolerules": [ - { - "role": { - "role": "User" - }, - "rule": [ - "Rule1Ctx", - "Rule1Ptn" - ] - } - ], - "rulesCtx": [ - { - "name": "Rule1Ctx", - "formexp": "relatie1Ctx [Concept0Ctx*Concept0Ctx] |- relatie2Ctx [Concept0Ctx*Concept0Ctx]", - "meaning": [], - "message": [] - }, - { - "name": "Rule2Ctx", - "formexp": "relatie6Ctx [Concept1Ctx*Concept3Ctx] |- relatie4Ctx [Concept1Ctx*Concept2Ctx];relatie5Ctx [Concept3Ctx*Concept2Ctx]~", - "meaning": [ - "this is the meaning of the RULE Rule2Ctx, gedefineerd in de CONTEXT" - ], - "message": [] - } - ], - "enforceCtx": [ - { - "name": "Compute relatie1Ctx[Concept0Ctx*Concept0Ctx] using DelPair", - "term": "relatie1Ctx [Concept0Ctx*Concept0Ctx] |- relatie2Ctx [Concept0Ctx*Concept0Ctx]/\\relatie3Ctx [Concept0Ctx*Concept0Ctx]", - "maintains": [ - { - "role": { - "role": null - }, - "rule": [ - "Compute relatie1Ctx[Concept0Ctx*Concept0Ctx] using DelPair", - "Compute relatie1Ptn[Concept0Ptn*Concept0Ptn] using DelPair" - ] - } - ], - "relation": [ - { - "relation": "relatie1Ctx", - "sign": { - "source": "Concept0Ctx", - "target": "Concept0Ctx" - }, - "properties": [], - "meaning": [ - "this is the meaning of the RELATION relatie1Ctx, gedefineerd in de CONTEXT" - ] - } - ], - "rhs": "relatie2Ctx [Concept0Ctx*Concept0Ctx]/\\relatie3Ctx [Concept0Ctx*Concept0Ctx]", - "operator": "Inclusion" - }, - { - "name": "Compute relatie1Ptn[Concept0Ptn*Concept0Ptn] using DelPair", - "term": "relatie1Ptn [Concept0Ptn*Concept0Ptn] |- relatie2Ptn [Concept0Ptn*Concept0Ptn]/\\relatie3Ptn [Concept0Ptn*Concept0Ptn]", - "maintains": [ - { - "role": { - "role": null - }, - "rule": [ - "Compute relatie1Ctx[Concept0Ctx*Concept0Ctx] using DelPair", - "Compute relatie1Ptn[Concept0Ptn*Concept0Ptn] using DelPair" - ] - } - ], - "relation": [ - { - "relation": "relatie1Ptn", - "sign": { - "source": "Concept0Ptn", - "target": "Concept0Ptn" - }, - "properties": [], - "meaning": [ - "this is the meaning of the RELATION relatie1Ptn, gedefineerd in de PATTERN" - ] - } - ], - "rhs": "relatie2Ptn [Concept0Ptn*Concept0Ptn]/\\relatie3Ptn [Concept0Ptn*Concept0Ptn]", - "operator": "Inclusion" - }, - { - "name": "Rule1Ctx", - "term": "relatie1Ctx [Concept0Ctx*Concept0Ctx] |- relatie2Ctx [Concept0Ctx*Concept0Ctx]", - "maintains": [ - { - "role": { - "role": "User" - }, - "rule": [ - "Rule1Ctx", - "Rule1Ptn" - ] - } - ], - "relation": [ - { - "relation": "relatie1Ctx", - "sign": { - "source": "Concept0Ctx", - "target": "Concept0Ctx" - }, - "properties": [], - "meaning": [ - "this is the meaning of the RELATION relatie1Ctx, gedefineerd in de CONTEXT" - ] - } - ], - "rhs": "relatie2Ctx [Concept0Ctx*Concept0Ctx]", - "operator": "Inclusion" - }, - { - "name": "Rule1Ptn", - "term": "relatie1Ptn [Concept0Ptn*Concept0Ptn] |- relatie2Ptn [Concept0Ptn*Concept0Ptn]", - "maintains": [ - { - "role": { - "role": "User" - }, - "rule": [ - "Rule1Ctx", - "Rule1Ptn" - ] - } - ], - "relation": [ - { - "relation": "relatie1Ptn", - "sign": { - "source": "Concept0Ptn", - "target": "Concept0Ptn" - }, - "properties": [], - "meaning": [ - "this is the meaning of the RELATION relatie1Ptn, gedefineerd in de PATTERN" - ] - } - ], - "rhs": "relatie2Ptn [Concept0Ptn*Concept0Ptn]", - "operator": "Inclusion" - } - ], - "purposes": [ - { - "conceptPurp": [], - "relationPurp": [], - "rulePurp": [], - "viewPurp": [], - "patternPurp": [], - "interfacePurp": [], - "contextPurp": [ - "ContextName" - ], - "meaning": "this is the purpose of the CONTEXT ContextName, gedefineerd in de CONTEXT" - }, - { - "conceptPurp": [ - "Concept0Ctx" - ], - "relationPurp": [], - "rulePurp": [], - "viewPurp": [], - "patternPurp": [], - "interfacePurp": [], - "contextPurp": [], - "meaning": "this is the purpose of the CONCEPT Concept0Ctx, gedefineerd in de CONTEXT" - }, - { - "conceptPurp": [], - "relationPurp": [ - { - "relation": "relatie1Ctx", - "sign": { - "source": "Concept0Ctx", - "target": "Concept0Ctx" - } - } - ], - "rulePurp": [], - "viewPurp": [], - "patternPurp": [], - "interfacePurp": [], - "contextPurp": [], - "meaning": "this is the purpose of the RELATION relatie1Ctx, gedefineerd in de CONTEXT" - }, - { - "conceptPurp": [], - "relationPurp": [], - "rulePurp": [ - "Rule1Ctx" - ], - "viewPurp": [], - "patternPurp": [], - "interfacePurp": [], - "contextPurp": [], - "meaning": "this is the purpose of the RULE RuleCtx, gedefineerd in de CONTEXT" - } - ], - "idents": [ - { - "name": "identity_Ident1Ctx", - "concept": "Rule_dd22648f-bc79-4c06-b289-374f0f1ec4a1", - "ident": { - "name": "relatie7Ctx [Concept5Ctx*Concept5Ctx];relatie7Ctx [Concept5Ctx*Concept5Ctx]~ |- I[Concept5Ctx]", - "ctx": "relatie7Ctx [Concept5Ctx*Concept5Ctx];relatie7Ctx [Concept5Ctx*Concept5Ctx]~ |- I[Concept5Ctx]" - } - }, - { - "name": "identity_FileObjectName", - "concept": "Rule_e07f1b6a-5013-4abf-9ec4-775a527ecd61", - "ident": { - "name": "filePath [FileObject*FilePath];filePath [FileObject*FilePath]~ |- I[FileObject]", - "ctx": "filePath [FileObject*FilePath];filePath [FileObject*FilePath]~ |- I[FileObject]" - } - } - ], - "versionInfo": "Ampersand-v4.8.0 [feature/atlas-import:de22bec58*], build time: 13-Jun-24 15:26:17 CEST", + "relationsCtx": [], + "rolerules": [], + "rulesCtx": [], + "enforceCtx": [], + "purposes": [], + "idents": [], + "versionInfo": "Ampersand-v4.8.0 [Add-prop-BIJ-FUN:513215c8f*], build time: 03-Jul-24 15:52:27 CEST", "language": null, "scripts": [ { diff --git a/AmpersandData/FormalAmpersand/Documentation.adl b/AmpersandData/FormalAmpersand/Documentation.adl index dc5e444a4..effa82591 100644 --- a/AmpersandData/FormalAmpersand/Documentation.adl +++ b/AmpersandData/FormalAmpersand/Documentation.adl @@ -12,8 +12,8 @@ PATTERN Documentation CONCEPT MarkupText "" CONCEPT Markup "" - RELATION language[Markup*Language][UNI,TOT] - RELATION text[Markup*MarkupText][UNI,TOT] + RELATION language[Markup*Language][UNI] -- TOT hier weggehaald wegens errormessage. Tempfix + RELATION text[Markup*MarkupText][UNI] -- TOT hier weggehaald wegens errormessage. Tempfix RULE enumerationOfLanguage : I[Language] = "Dutch" \/ "English" POPULATION Language CONTAINS ["Dutch", "English" ] RELATION origin[Purpose*Origin][] diff --git a/out.adl b/out.adl index ca15d19a0..5b4fd8a62 100644 --- a/out.adl +++ b/out.adl @@ -1,81 +1,42 @@ CONTEXT ContextName -- Concepts -CONCEPT Concept4Ctx "this is the definition of CONCEPT Concept4Ctx in de CONTEXT" -CONCEPT Concept1Ctx "this is the definition of CONCEPT Concept1Ctx in de CONTEXT" -CONCEPT Concept2Ctx "this is the definition of CONCEPT Concept2Ctx in de CONTEXT" -CONCEPT Concept3Ctx "this is the definition of CONCEPT Concept3Ctx in de CONTEXT" -CONCEPT Concept5Ctx "this is the definition of CONCEPT Concept5Ctx in de CONTEXT" +CONCEPT "ONE" "Definition not provided" -- Relations -RELATION originalFileName [FileObject*FileName] [UNI - ,TOT] - -RELATION relatie4Ctx [Concept1Ctx*Concept2Ctx] [TOT] -MEANING "this is the meaning of the RELATION relatie4Ctx, gedefineerd in de CONTEXT" -RELATION filePath [FileObject*FilePath] [UNI - ,TOT] - -RELATION relatie1Ctx [Concept0Ctx*Concept0Ctx] -MEANING "this is the meaning of the RELATION relatie1Ctx, gedefineerd in de CONTEXT" -RELATION relatie5Ctx [Concept3Ctx*Concept2Ctx] -MEANING "this is the meaning of the RELATION relatie5Ctx, gedefineerd in de CONTEXT" -RELATION relatie7Ctx [Concept4Ctx*Concept4Ctx] -MEANING "this is the meaning of the RELATION relatie7Ctx, gedefineerd in de CONTEXT" -RELATION relatie3Ctx [Concept0Ctx*Concept0Ctx] -MEANING "this is the meaning of the RELATION relatie3Ctx, gedefineerd in de CONTEXT" -RELATION relatie2Ctx [Concept0Ctx*Concept0Ctx] -MEANING "this is the meaning of the RELATION relatie2Ctx, gedefineerd in de CONTEXT" -RELATION relatie6Ctx [Concept1Ctx*Concept3Ctx] -MEANING "this is the meaning of the RELATION relatie6Ctx, gedefineerd in de CONTEXT" -RELATION relatie7Ctx [Concept5Ctx*Concept5Ctx] - --- Rules -RULE Rule1Ctx: relatie1Ctx [Concept0Ctx*Concept0Ctx] - - -RULE Rule2Ctx: relatie6Ctx [Concept1Ctx*Concept3Ctx] -MEANING "this is the meaning of the RULE Rule2Ctx, gedefineerd in de CONTEXT" +-- Rules -IDENT identity_Ident1Ctx : "Rule_dd22648f-bc79-4c06-b289-374f0f1ec4a1" (relatie7Ctx [Concept5Ctx*Concept5Ctx];relatie7Ctx [Concept5Ctx*Concept5Ctx]~ ) -IDENT identity_FileObjectName : "Rule_e07f1b6a-5013-4abf-9ec4-775a527ecd61" (filePath [FileObject*FilePath];filePath [FileObject*FilePath]~ ) PATTERN PatternName -- Concepts CONCEPT Concept2Ptn "this is the definition of CONCEPT Concept2Ptn in de PATTERN" CONCEPT Concept0Ptn "this is the definition of CONCEPT Concept0Ptn in de PATTERN" -CONCEPT Concept1Ptn "this is the definition of CONCEPT Concept1Ptn in de PATTERN" CONCEPT Concept3Ptn "this is the definition of CONCEPT Concept3Ptn in de PATTERN" +CONCEPT Concept1Ptn "this is the definition of CONCEPT Concept1Ptn in de PATTERN" CONCEPT Concept4Ptn "this is the definition of CONCEPT Concept4Ptn in de PATTERN" -- Relations +RELATION relatie1Ptn [Concept0Ptn*Concept0Ptn] [BIJ] +MEANING "this is the meaning of the RELATION relatie1Ptn, gedefineerd in de PATTERN" +RELATION relatie4Ptn [Concept1Ptn*Concept2Ptn] +MEANING "this is the meaning of the RELATION relatie4Ptn, gedefineerd in de PATTERN" +RELATION relatie2Ptn [Concept0Ptn*Concept0Ptn] +MEANING "this is the meaning of the RELATION relatie2Ptn, gedefineerd in de PATTERN" RELATION relatie6Ptn [Concept1Ptn*Concept3Ptn] MEANING "this is the meaning of the RELATION relatie6Ptn, gedefineerd in de PATTERN" +RELATION relatie7Ptn [Concept4Ptn*Concept3Ptn] +MEANING "this is the meaning of the RELATION relatie7Ptn, gedefineerd in de PATTERN" RELATION relatie5Ptn [Concept3Ptn*Concept2Ptn] MEANING "this is the meaning of the RELATION relatie5Ptn, gedefineerd in de PATTERN" -RELATION relatie3Ptn [Concept0Ptn*Concept0Ptn] -MEANING "this is the meaning of the RELATION relatie3Ptn, gedefineerd in de PATTERN" -RELATION relatie7Ptn [Concept4Ptn*Concept4Ptn] -MEANING "this is the meaning of the RELATION relatie7Ptn, gedefineerd in de PATTERN" -RELATION relatie4Ptn [Concept1Ptn*Concept2Ptn] [TOT] -MEANING "this is the meaning of the RELATION relatie4Ptn, gedefineerd in de PATTERN" -RELATION relatie1Ptn [Concept0Ptn*Concept0Ptn] -MEANING "this is the meaning of the RELATION relatie1Ptn, gedefineerd in de PATTERN" -RELATION relatie2Ptn [Concept0Ptn*Concept0Ptn] -MEANING "this is the meaning of the RELATION relatie2Ptn, gedefineerd in de PATTERN" -- Rules RULE Rule2Ptn: relatie6Ptn [Concept1Ptn*Concept3Ptn] MEANING "this is the meaning of the RULE Rule2Ptn, gedefineerd in de PATTERN" -RULE Rule1Ptn: relatie1Ptn [Concept0Ptn*Concept0Ptn] - - - @@ -88,16 +49,9 @@ PURPOSE CONCEPT Concept1Ptn PURPOSE RELATION relatie1Ptn [Concept0Ptn*Concept0Ptn] {+this is the purpose of the RELATION relatie1Ptn, gedefineerd in de PATTERN+} ENDPATTERN -ROLE User MAINTAINS Rule1Ctx,Rule1Ptn -PURPOSE CONTEXT ContextName -{+this is the purpose of the CONTEXT ContextName, gedefineerd in de CONTEXT+} -PURPOSE CONCEPT Concept0Ctx -{+this is the purpose of the CONCEPT Concept0Ctx, gedefineerd in de CONTEXT+} -PURPOSE RELATION relatie1Ctx [Concept0Ctx*Concept0Ctx] -{+this is the purpose of the RELATION relatie1Ctx, gedefineerd in de CONTEXT+} -PURPOSE RULE Rule1Ctx -{+this is the purpose of the RULE RuleCtx, gedefineerd in de CONTEXT+} + + ENDCONTEXT \ No newline at end of file diff --git a/out_generated_pop.json b/out_generated_pop.json new file mode 100644 index 000000000..26cc6c9fd --- /dev/null +++ b/out_generated_pop.json @@ -0,0 +1,1608 @@ +{ + "atoms": [ + { + "atoms": [ + "Ampersand-v4.8.0 [Add-prop-BIJ-FUN:513215c8f*], build time: 03-Jul-24 15:52:27 CEST" + ], + "concept": "AmpersandVersion" + }, + { + "atoms": [], + "concept": "AtomValue" + }, + { + "atoms": [], + "concept": "BinaryTerm" + }, + { + "atoms": [ + "EDcD_32_relatie6Ptn_91_Concept1Ptn_42_Concept3Ptn_#-4076201424342764243#" + ], + "concept": "BindedRelation" + }, + { + "atoms": [], + "concept": "Box" + }, + { + "atoms": [], + "concept": "BoxHeader" + }, + { + "atoms": [], + "concept": "BoxItem" + }, + { + "atoms": [], + "concept": "BxExpr" + }, + { + "atoms": [], + "concept": "BxTxt" + }, + { + "atoms": [], + "concept": "CombineStrings" + }, + { + "atoms": [ + "ONE", + "Concept2Ptn", + "Concept3Ptn", + "Concept0Ptn", + "Concept1Ptn", + "Concept4Ptn" + ], + "concept": "Concept" + }, + { + "atoms": [ + "ONE", + "Concept2Ptn", + "Concept3Ptn", + "Concept0Ptn", + "Concept1Ptn", + "Concept4Ptn" + ], + "concept": "ConceptDef" + }, + { + "atoms": [ + "ONE", + "Concept2Ptn", + "Concept3Ptn", + "Concept0Ptn", + "Concept1Ptn", + "Concept4Ptn" + ], + "concept": "ConceptName" + }, + { + "atoms": [ + "conj__0" + ], + "concept": "Conjunct" + }, + { + "atoms": [ + "ContextName" + ], + "concept": "Context" + }, + { + "atoms": [ + "ContextName" + ], + "concept": "ContextName" + }, + { + "atoms": [], + "concept": "Cruds" + }, + { + "atoms": [ + "ONE", + "Concept2Ptn", + "Concept3Ptn", + "Concept0Ptn", + "Concept1Ptn", + "Concept4Ptn", + "PatternName", + "Rule2Ptn" + ], + "concept": "EncodedName" + }, + { + "atoms": [], + "concept": "Epsilon" + }, + { + "atoms": [], + "concept": "FieldDef" + }, + { + "atoms": [], + "concept": "FieldName" + }, + { + "atoms": [], + "concept": "Interface" + }, + { + "atoms": [], + "concept": "InterfaceName" + }, + { + "atoms": [], + "concept": "InterfaceRef" + }, + { + "atoms": [], + "concept": "IsE" + }, + { + "atoms": [], + "concept": "Isa" + }, + { + "atoms": [ + "English" + ], + "concept": "Language" + }, + { + "atoms": [ + "Markup_32__123_amLang_32__61__32_English_44__32_am#-798934108058446600#", + "Markup_32__123_amLang_32__61__32_English_44__32_am#780419289325136719#", + "Markup_32__123_amLang_32__61__32_English_44__32_am#6957948246529230050#", + "Markup_32__123_amLang_32__61__32_English_44__32_am#3565108094868953990#", + "Markup_32__123_amLang_32__61__32_English_44__32_am#-3596564259022656172#", + "Markup_32__123_amLang_32__61__32_English_44__32_am#-4416761693972881498#", + "Markup_32__123_amLang_32__61__32_English_44__32_am#6607581912605832750#", + "Markup_32__123_amLang_32__61__32_English_44__32_am#9033086796309510097#", + "Markup_32__123_amLang_32__61__32_English_44__32_am#-3114025089730486240#", + "Markup_32__123_amLang_32__61__32_English_44__32_am#7881207238937330204#", + "Markup_32__123_amLang_32__61__32_English_44__32_am#977393125919530039#", + "Markup_32__123_amLang_32__61__32_English_44__32_am#6995093958773664282#", + "Markup_32__123_amLang_32__61__32_English_44__32_am#-1656354467933384191#", + "Markup_32__123_amLang_32__61__32_English_44__32_am#-1999658074228190521#", + "Markup_32__123_amLang_32__61__32_English_44__32_am#2154374317484107883#", + "Markup_32__123_amLang_32__61__32_English_44__32_am#-7158099665861021703#" + ], + "concept": "Markup" + }, + { + "atoms": [ + "this is the meaning of the RELATION relatie5Ptn, gedefineerd in de PATTERN", + "this is the definition of CONCEPT Concept1Ptn in de PATTERN", + "this is the purpose of the RELATION relatie1Ptn, gedefineerd in de PATTERN", + "this is the definition of CONCEPT Concept4Ptn in de PATTERN", + "this is the definition of CONCEPT Concept3Ptn in de PATTERN", + "this is the definition of CONCEPT Concept2Ptn in de PATTERN", + "this is the meaning of the RELATION relatie7Ptn, gedefineerd in de PATTERN", + "this is the meaning of the RELATION relatie4Ptn, gedefineerd in de PATTERN", + "this is the meaning of the RELATION relatie6Ptn, gedefineerd in de PATTERN", + "this is the meaning of the RELATION relatie2Ptn, gedefineerd in de PATTERN", + "this is the purpose of the CONCEPT ConceptPtn, gedefineerd in de PATTERN", + "Definition not provided", + "this is the purpose of the PATTERN PatternName, gedefineerd in de PATTERN", + "this is the meaning of the RELATION relatie1Ptn, gedefineerd in de PATTERN", + "this is the definition of CONCEPT Concept0Ptn in de PATTERN", + "this is the meaning of the RULE Rule2Ptn, gedefineerd in de PATTERN" + ], + "concept": "MarkupText" + }, + { + "atoms": [ + "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#7336011820590190957#", + "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#-8267445001533881757#", + "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#2972967415894657638#", + "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#1963907686092605770#", + "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#3661585823743132977#", + "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#-8020230793269538486#", + "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#4514009685666603721#", + "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#3820039773241830538#", + "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#7685031061723645971#", + "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#-5045929839480954488#", + "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#-39338667786759613#", + "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#1708884214360249389#", + "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#6507961272176518548#" + ], + "concept": "Meaning" + }, + { + "atoms": [], + "concept": "ObjectDef" + }, + { + "atoms": [], + "concept": "Operator" + }, + { + "atoms": [ + "/workspaces/Ampersand/out.adl:49:1", + "/workspaces/Ampersand/out.adl:45:1", + "/workspaces/Ampersand/out.adl:47:1", + "/workspaces/Ampersand/out.adl:36:1" + ], + "concept": "Origin" + }, + { + "atoms": [], + "concept": "PairView" + }, + { + "atoms": [], + "concept": "PairViewSegment" + }, + { + "atoms": [ + "PatternName" + ], + "concept": "Pattern" + }, + { + "atoms": [ + "PatternName" + ], + "concept": "PatternName" + }, + { + "atoms": [], + "concept": "Property" + }, + { + "atoms": [], + "concept": "PropertyRule" + }, + { + "atoms": [ + "Markup__Markup_32__123_amLang_32__61__32_English_4#-335284088059692595#", + "Markup__Markup_32__123_amLang_32__61__32_English_4#-3111979090180105134#", + "Markup__Markup_32__123_amLang_32__61__32_English_4#-6962082011968568143#" + ], + "concept": "Purpose" + }, + { + "atoms": [], + "concept": "Quad" + }, + { + "atoms": [ + "relatie1Ptn_91_Concept0Ptn_42_Concept0Ptn_93_", + "relatie6Ptn_91_Concept1Ptn_42_Concept3Ptn_93_", + "relatie7Ptn_91_Concept4Ptn_42_Concept3Ptn_93_", + "relatie4Ptn_91_Concept1Ptn_42_Concept2Ptn_93_", + "relatie2Ptn_91_Concept0Ptn_42_Concept0Ptn_93_", + "relatie5Ptn_91_Concept3Ptn_42_Concept2Ptn_93_" + ], + "concept": "Relation" + }, + { + "atoms": [ + "relatie6Ptn", + "relatie7Ptn", + "relatie4Ptn", + "relatie5Ptn", + "relatie2Ptn", + "relatie1Ptn" + ], + "concept": "RelationName" + }, + { + "atoms": [], + "concept": "Role" + }, + { + "atoms": [], + "concept": "RoleName" + }, + { + "atoms": [ + "Rule2Ptn" + ], + "concept": "Rule" + }, + { + "atoms": [ + "Rule2Ptn" + ], + "concept": "RuleName" + }, + { + "atoms": [], + "concept": "SequenceNumber" + }, + { + "atoms": [ + "relatie6Ptn [Concept1Ptn*Concept3Ptn]" + ], + "concept": "ShowADL" + }, + { + "atoms": [ + "_91_Concept3Ptn_42_Concept2Ptn_93_", + "_91_Concept0Ptn_42_Concept0Ptn_93_", + "_91_Concept1Ptn_42_Concept3Ptn_93_", + "_91_Concept4Ptn_42_Concept3Ptn_93_", + "_91_Concept1Ptn_42_Concept2Ptn_93_" + ], + "concept": "Signature" + }, + { + "atoms": [], + "concept": "Singleton" + }, + { + "atoms": [], + "concept": "SourceOrTarget" + }, + { + "atoms": [], + "concept": "String" + }, + { + "atoms": [], + "concept": "SubInterface" + }, + { + "atoms": [ + "EDcD_32_relatie6Ptn_91_Concept1Ptn_42_Concept3Ptn_#-4076201424342764243#" + ], + "concept": "Term" + }, + { + "atoms": [], + "concept": "Text" + }, + { + "atoms": [], + "concept": "UnaryTerm" + }, + { + "atoms": [], + "concept": "V" + }, + { + "atoms": [], + "concept": "View" + }, + { + "atoms": [ + "1" + ], + "concept": "ONE" + } + ], + "links": [ + { + "links": [ + { + "src": "ContextName", + "tgt": "conj__0" + } + ], + "relation": "allConjuncts[Context*Conjunct]" + }, + { + "links": [], + "relation": "allRoles[Context*Role]" + }, + { + "links": [ + { + "src": "Rule2Ptn", + "tgt": "ContextName" + } + ], + "relation": "allRules[Rule*Context]" + }, + { + "links": [], + "relation": "arg[UnaryTerm*Term]" + }, + { + "links": [ + { + "src": "EDcD_32_relatie6Ptn_91_Concept1Ptn_42_Concept3Ptn_#-4076201424342764243#", + "tgt": "relatie6Ptn_91_Concept1Ptn_42_Concept3Ptn_93_" + } + ], + "relation": "bind[BindedRelation*Relation]" + }, + { + "links": [ + { + "src": "ONE", + "tgt": "ONE" + }, + { + "src": "Concept2Ptn", + "tgt": "Concept2Ptn" + }, + { + "src": "Concept3Ptn", + "tgt": "Concept3Ptn" + }, + { + "src": "Concept0Ptn", + "tgt": "Concept0Ptn" + }, + { + "src": "Concept1Ptn", + "tgt": "Concept1Ptn" + }, + { + "src": "Concept4Ptn", + "tgt": "Concept4Ptn" + } + ], + "relation": "concept[ConceptDef*Concept]" + }, + { + "links": [ + { + "src": "PatternName", + "tgt": "Concept2Ptn" + }, + { + "src": "PatternName", + "tgt": "Concept3Ptn" + }, + { + "src": "PatternName", + "tgt": "Concept0Ptn" + }, + { + "src": "PatternName", + "tgt": "Concept1Ptn" + }, + { + "src": "PatternName", + "tgt": "Concept4Ptn" + } + ], + "relation": "concepts[Pattern*Concept]" + }, + { + "links": [ + { + "src": "ONE", + "tgt": "ContextName" + }, + { + "src": "Concept2Ptn", + "tgt": "ContextName" + }, + { + "src": "Concept3Ptn", + "tgt": "ContextName" + }, + { + "src": "Concept0Ptn", + "tgt": "ContextName" + }, + { + "src": "Concept1Ptn", + "tgt": "ContextName" + }, + { + "src": "Concept4Ptn", + "tgt": "ContextName" + } + ], + "relation": "context[Concept*Context]" + }, + { + "links": [], + "relation": "context[Interface*Context]" + }, + { + "links": [], + "relation": "context[IsE*Context]" + }, + { + "links": [], + "relation": "context[Isa*Context]" + }, + { + "links": [ + { + "src": "PatternName", + "tgt": "ContextName" + } + ], + "relation": "context[Pattern*Context]" + }, + { + "links": [ + { + "src": "Rule2Ptn", + "tgt": "ContextName" + } + ], + "relation": "context[Rule*Context]" + }, + { + "links": [], + "relation": "ctxds[Relation*Context]" + }, + { + "links": [], + "relation": "ctxrs[Rule*Context]" + }, + { + "links": [ + { + "src": "relatie1Ptn_91_Concept0Ptn_42_Concept0Ptn_93_", + "tgt": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#4514009685666603721#" + }, + { + "src": "relatie6Ptn_91_Concept1Ptn_42_Concept3Ptn_93_", + "tgt": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#-8020230793269538486#" + }, + { + "src": "relatie7Ptn_91_Concept4Ptn_42_Concept3Ptn_93_", + "tgt": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#-39338667786759613#" + }, + { + "src": "relatie4Ptn_91_Concept1Ptn_42_Concept2Ptn_93_", + "tgt": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#6507961272176518548#" + }, + { + "src": "relatie2Ptn_91_Concept0Ptn_42_Concept0Ptn_93_", + "tgt": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#2972967415894657638#" + }, + { + "src": "relatie5Ptn_91_Concept3Ptn_42_Concept2Ptn_93_", + "tgt": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#7336011820590190957#" + } + ], + "relation": "decMean[Relation*Meaning]" + }, + { + "links": [ + { + "src": "relatie1Ptn_91_Concept0Ptn_42_Concept0Ptn_93_", + "tgt": "PatternName" + }, + { + "src": "relatie6Ptn_91_Concept1Ptn_42_Concept3Ptn_93_", + "tgt": "PatternName" + }, + { + "src": "relatie7Ptn_91_Concept4Ptn_42_Concept3Ptn_93_", + "tgt": "PatternName" + }, + { + "src": "relatie4Ptn_91_Concept1Ptn_42_Concept2Ptn_93_", + "tgt": "PatternName" + }, + { + "src": "relatie2Ptn_91_Concept0Ptn_42_Concept0Ptn_93_", + "tgt": "PatternName" + }, + { + "src": "relatie5Ptn_91_Concept3Ptn_42_Concept2Ptn_93_", + "tgt": "PatternName" + } + ], + "relation": "declaredIn[Relation*Pattern]" + }, + { + "links": [], + "relation": "declaredthrough[PropertyRule*Property]" + }, + { + "links": [], + "relation": "decprL[Relation*String]" + }, + { + "links": [], + "relation": "decprM[Relation*String]" + }, + { + "links": [], + "relation": "decprR[Relation*String]" + }, + { + "links": [], + "relation": "edit[FieldDef*Relation]" + }, + { + "links": [], + "relation": "editFlp[FieldDef*Relation]" + }, + { + "links": [ + { + "src": "Markup__Markup_32__123_amLang_32__61__32_English_4#-335284088059692595#", + "tgt": "Markup_32__123_amLang_32__61__32_English_44__32_am#-798934108058446600#" + }, + { + "src": "Markup__Markup_32__123_amLang_32__61__32_English_4#-3111979090180105134#", + "tgt": "Markup_32__123_amLang_32__61__32_English_44__32_am#-1656354467933384191#" + }, + { + "src": "Markup__Markup_32__123_amLang_32__61__32_English_4#-6962082011968568143#", + "tgt": "Markup_32__123_amLang_32__61__32_English_44__32_am#3565108094868953990#" + } + ], + "relation": "explMarkup[Purpose*Markup]" + }, + { + "links": [], + "relation": "explRefIds[Purpose*Text]" + }, + { + "links": [], + "relation": "first[BinaryTerm*Term]" + }, + { + "links": [ + { + "src": "Rule2Ptn", + "tgt": "EDcD_32_relatie6Ptn_91_Concept1Ptn_42_Concept3Ptn_#-4076201424342764243#" + } + ], + "relation": "formalTerm[Rule*Term]" + }, + { + "links": [], + "relation": "fst[CombineStrings*String]" + }, + { + "links": [], + "relation": "gengen[IsE*Concept]" + }, + { + "links": [], + "relation": "gengen[Isa*Concept]" + }, + { + "links": [], + "relation": "genspc[IsE*Concept]" + }, + { + "links": [], + "relation": "genspc[Isa*Concept]" + }, + { + "links": [], + "relation": "identityRules[Rule*Context]" + }, + { + "links": [], + "relation": "identityRules[Rule*Pattern]" + }, + { + "links": [], + "relation": "ifcConjuncts[Interface*Conjunct]" + }, + { + "links": [], + "relation": "ifcInputs[Interface*Relation]" + }, + { + "links": [], + "relation": "ifcObj[Interface*ObjectDef]" + }, + { + "links": [], + "relation": "ifcOutputs[Interface*Relation]" + }, + { + "links": [], + "relation": "ifcPos[Interface*Origin]" + }, + { + "links": [], + "relation": "ifcPurpose[Interface*Purpose]" + }, + { + "links": [], + "relation": "ifcQuads[Interface*Quad]" + }, + { + "links": [], + "relation": "ifcRoles[Interface*Role]" + }, + { + "links": [], + "relation": "interfaces[Context*Interface]" + }, + { + "links": [], + "relation": "interfaces[Role*Interface]" + }, + { + "links": [], + "relation": "isAPI[Interface*Interface]" + }, + { + "links": [], + "relation": "isLink[InterfaceRef*InterfaceRef]" + }, + { + "links": [], + "relation": "isPublic[Interface*Interface]" + }, + { + "links": [], + "relation": "isa[Concept*Concept]" + }, + { + "links": [], + "relation": "isaCopy[Concept*Concept]" + }, + { + "links": [], + "relation": "isaPlus[Concept*Concept]" + }, + { + "links": [], + "relation": "isaRfx[Concept*Concept]" + }, + { + "links": [], + "relation": "isaRfxCopy[Concept*Concept]" + }, + { + "links": [], + "relation": "isaRfxPlus[Concept*Concept]" + }, + { + "links": [], + "relation": "isaRfxStar[Concept*Concept]" + }, + { + "links": [], + "relation": "isaStar[Concept*Concept]" + }, + { + "links": [], + "relation": "label[FieldDef*FieldName]" + }, + { + "links": [ + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#-798934108058446600#", + "tgt": "English" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#780419289325136719#", + "tgt": "English" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#6957948246529230050#", + "tgt": "English" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#3565108094868953990#", + "tgt": "English" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#-3596564259022656172#", + "tgt": "English" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#-4416761693972881498#", + "tgt": "English" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#6607581912605832750#", + "tgt": "English" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#9033086796309510097#", + "tgt": "English" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#-3114025089730486240#", + "tgt": "English" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#7881207238937330204#", + "tgt": "English" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#977393125919530039#", + "tgt": "English" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#6995093958773664282#", + "tgt": "English" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#-1656354467933384191#", + "tgt": "English" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#-1999658074228190521#", + "tgt": "English" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#2154374317484107883#", + "tgt": "English" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#-7158099665861021703#", + "tgt": "English" + } + ], + "relation": "language[Markup*Language]" + }, + { + "links": [], + "relation": "maintains[Role*Rule]" + }, + { + "links": [ + { + "src": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#7336011820590190957#", + "tgt": "Markup_32__123_amLang_32__61__32_English_44__32_am#6607581912605832750#" + }, + { + "src": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#-8267445001533881757#", + "tgt": "Markup_32__123_amLang_32__61__32_English_44__32_am#7881207238937330204#" + }, + { + "src": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#2972967415894657638#", + "tgt": "Markup_32__123_amLang_32__61__32_English_44__32_am#2154374317484107883#" + }, + { + "src": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#1963907686092605770#", + "tgt": "Markup_32__123_amLang_32__61__32_English_44__32_am#-1999658074228190521#" + }, + { + "src": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#3661585823743132977#", + "tgt": "Markup_32__123_amLang_32__61__32_English_44__32_am#-4416761693972881498#" + }, + { + "src": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#-8020230793269538486#", + "tgt": "Markup_32__123_amLang_32__61__32_English_44__32_am#977393125919530039#" + }, + { + "src": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#4514009685666603721#", + "tgt": "Markup_32__123_amLang_32__61__32_English_44__32_am#6957948246529230050#" + }, + { + "src": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#3820039773241830538#", + "tgt": "Markup_32__123_amLang_32__61__32_English_44__32_am#780419289325136719#" + }, + { + "src": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#7685031061723645971#", + "tgt": "Markup_32__123_amLang_32__61__32_English_44__32_am#-3114025089730486240#" + }, + { + "src": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#-5045929839480954488#", + "tgt": "Markup_32__123_amLang_32__61__32_English_44__32_am#9033086796309510097#" + }, + { + "src": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#-39338667786759613#", + "tgt": "Markup_32__123_amLang_32__61__32_English_44__32_am#-3596564259022656172#" + }, + { + "src": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#1708884214360249389#", + "tgt": "Markup_32__123_amLang_32__61__32_English_44__32_am#6995093958773664282#" + }, + { + "src": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#6507961272176518548#", + "tgt": "Markup_32__123_amLang_32__61__32_English_44__32_am#-7158099665861021703#" + } + ], + "relation": "markup[Meaning*Markup]" + }, + { + "links": [ + { + "src": "ONE", + "tgt": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#1963907686092605770#" + }, + { + "src": "Concept2Ptn", + "tgt": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#-8267445001533881757#" + }, + { + "src": "Concept3Ptn", + "tgt": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#-5045929839480954488#" + }, + { + "src": "Concept0Ptn", + "tgt": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#1708884214360249389#" + }, + { + "src": "Concept1Ptn", + "tgt": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#3820039773241830538#" + }, + { + "src": "Concept4Ptn", + "tgt": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#3661585823743132977#" + } + ], + "relation": "meaning[ConceptDef*Meaning]" + }, + { + "links": [ + { + "src": "Rule2Ptn", + "tgt": "Meaning_32__123_ameaMrk_32__61__32_Markup_32__123_#7685031061723645971#" + } + ], + "relation": "meaning[Rule*Meaning]" + }, + { + "links": [], + "relation": "message[Rule*Markup]" + }, + { + "links": [ + { + "src": "ONE", + "tgt": "ONE" + }, + { + "src": "Concept2Ptn", + "tgt": "Concept2Ptn" + }, + { + "src": "Concept3Ptn", + "tgt": "Concept3Ptn" + }, + { + "src": "Concept0Ptn", + "tgt": "Concept0Ptn" + }, + { + "src": "Concept1Ptn", + "tgt": "Concept1Ptn" + }, + { + "src": "Concept4Ptn", + "tgt": "Concept4Ptn" + } + ], + "relation": "name[Concept*ConceptName]" + }, + { + "links": [ + { + "src": "ContextName", + "tgt": "ContextName" + } + ], + "relation": "name[Context*ContextName]" + }, + { + "links": [], + "relation": "name[Interface*InterfaceName]" + }, + { + "links": [ + { + "src": "PatternName", + "tgt": "PatternName" + } + ], + "relation": "name[Pattern*PatternName]" + }, + { + "links": [ + { + "src": "relatie1Ptn_91_Concept0Ptn_42_Concept0Ptn_93_", + "tgt": "relatie1Ptn" + }, + { + "src": "relatie6Ptn_91_Concept1Ptn_42_Concept3Ptn_93_", + "tgt": "relatie6Ptn" + }, + { + "src": "relatie7Ptn_91_Concept4Ptn_42_Concept3Ptn_93_", + "tgt": "relatie7Ptn" + }, + { + "src": "relatie4Ptn_91_Concept1Ptn_42_Concept2Ptn_93_", + "tgt": "relatie4Ptn" + }, + { + "src": "relatie2Ptn_91_Concept0Ptn_42_Concept0Ptn_93_", + "tgt": "relatie2Ptn" + }, + { + "src": "relatie5Ptn_91_Concept3Ptn_42_Concept2Ptn_93_", + "tgt": "relatie5Ptn" + } + ], + "relation": "name[Relation*RelationName]" + }, + { + "links": [], + "relation": "name[Role*RoleName]" + }, + { + "links": [ + { + "src": "Rule2Ptn", + "tgt": "Rule2Ptn" + } + ], + "relation": "name[Rule*RuleName]" + }, + { + "links": [], + "relation": "objDef[BxExpr*ObjectDef]" + }, + { + "links": [], + "relation": "objSub[ObjectDef*SubInterface]" + }, + { + "links": [], + "relation": "objTerm[ObjectDef*Term]" + }, + { + "links": [], + "relation": "objView[ObjectDef*View]" + }, + { + "links": [], + "relation": "objcruds[ObjectDef*Cruds]" + }, + { + "links": [], + "relation": "operator[BinaryTerm*Operator]" + }, + { + "links": [], + "relation": "operator[UnaryTerm*Operator]" + }, + { + "links": [], + "relation": "origin[BoxItem*Origin]" + }, + { + "links": [], + "relation": "origin[ObjectDef*Origin]" + }, + { + "links": [ + { + "src": "Markup__Markup_32__123_amLang_32__61__32_English_4#-335284088059692595#", + "tgt": "/workspaces/Ampersand/out.adl:47:1" + }, + { + "src": "Markup__Markup_32__123_amLang_32__61__32_English_4#-3111979090180105134#", + "tgt": "/workspaces/Ampersand/out.adl:49:1" + }, + { + "src": "Markup__Markup_32__123_amLang_32__61__32_English_4#-6962082011968568143#", + "tgt": "/workspaces/Ampersand/out.adl:45:1" + } + ], + "relation": "origin[Purpose*Origin]" + }, + { + "links": [ + { + "src": "Rule2Ptn", + "tgt": "/workspaces/Ampersand/out.adl:36:1" + } + ], + "relation": "origin[Rule*Origin]" + }, + { + "links": [], + "relation": "origin[SubInterface*Origin]" + }, + { + "links": [], + "relation": "originatesFrom[Conjunct*Rule]" + }, + { + "links": [ + { + "src": "PatternName", + "tgt": "Rule2Ptn" + } + ], + "relation": "patRules[Pattern*Rule]" + }, + { + "links": [], + "relation": "prop[Relation*Property]" + }, + { + "links": [], + "relation": "propertyRule[Relation*PropertyRule]" + }, + { + "links": [ + { + "src": "Concept1Ptn", + "tgt": "Markup__Markup_32__123_amLang_32__61__32_English_4#-335284088059692595#" + } + ], + "relation": "purpose[Concept*Purpose]" + }, + { + "links": [], + "relation": "purpose[Context*Purpose]" + }, + { + "links": [], + "relation": "purpose[Interface*Purpose]" + }, + { + "links": [ + { + "src": "PatternName", + "tgt": "Markup__Markup_32__123_amLang_32__61__32_English_4#-6962082011968568143#" + } + ], + "relation": "purpose[Pattern*Purpose]" + }, + { + "links": [ + { + "src": "relatie1Ptn_91_Concept0Ptn_42_Concept0Ptn_93_", + "tgt": "Markup__Markup_32__123_amLang_32__61__32_English_4#-3111979090180105134#" + } + ], + "relation": "purpose[Relation*Purpose]" + }, + { + "links": [], + "relation": "purpose[Rule*Purpose]" + }, + { + "links": [], + "relation": "purpose[View*Purpose]" + }, + { + "links": [], + "relation": "pvsExp[PairViewSegment*Term]" + }, + { + "links": [ + { + "src": "conj__0", + "tgt": "EDcD_32_relatie6Ptn_91_Concept1Ptn_42_Concept3Ptn_#-4076201424342764243#" + } + ], + "relation": "rc_conjunct[Conjunct*Term]" + }, + { + "links": [], + "relation": "references[InterfaceRef*Interface]" + }, + { + "links": [ + { + "src": "relatie1Ptn_91_Concept0Ptn_42_Concept0Ptn_93_", + "tgt": "ContextName" + }, + { + "src": "relatie6Ptn_91_Concept1Ptn_42_Concept3Ptn_93_", + "tgt": "ContextName" + }, + { + "src": "relatie7Ptn_91_Concept4Ptn_42_Concept3Ptn_93_", + "tgt": "ContextName" + }, + { + "src": "relatie4Ptn_91_Concept1Ptn_42_Concept2Ptn_93_", + "tgt": "ContextName" + }, + { + "src": "relatie2Ptn_91_Concept0Ptn_42_Concept0Ptn_93_", + "tgt": "ContextName" + }, + { + "src": "relatie5Ptn_91_Concept3Ptn_42_Concept2Ptn_93_", + "tgt": "ContextName" + } + ], + "relation": "relsDefdIn[Relation*Context]" + }, + { + "links": [], + "relation": "result[CombineStrings*String]" + }, + { + "links": [], + "relation": "rrviol[Rule*PairView]" + }, + { + "links": [], + "relation": "second[BinaryTerm*Term]" + }, + { + "links": [], + "relation": "segment[PairView*PairViewSegment]" + }, + { + "links": [], + "relation": "sequenceNr[PairViewSegment*SequenceNumber]" + }, + { + "links": [], + "relation": "showADL[PairView*ShowADL]" + }, + { + "links": [ + { + "src": "EDcD_32_relatie6Ptn_91_Concept1Ptn_42_Concept3Ptn_#-4076201424342764243#", + "tgt": "relatie6Ptn [Concept1Ptn*Concept3Ptn]" + } + ], + "relation": "showADL[Term*ShowADL]" + }, + { + "links": [], + "relation": "siConcept[Box*Concept]" + }, + { + "links": [], + "relation": "siHeader[Box*BoxHeader]" + }, + { + "links": [], + "relation": "siObjs[Box*BoxItem]" + }, + { + "links": [ + { + "src": "relatie1Ptn_91_Concept0Ptn_42_Concept0Ptn_93_", + "tgt": "_91_Concept0Ptn_42_Concept0Ptn_93_" + }, + { + "src": "relatie6Ptn_91_Concept1Ptn_42_Concept3Ptn_93_", + "tgt": "_91_Concept1Ptn_42_Concept3Ptn_93_" + }, + { + "src": "relatie7Ptn_91_Concept4Ptn_42_Concept3Ptn_93_", + "tgt": "_91_Concept4Ptn_42_Concept3Ptn_93_" + }, + { + "src": "relatie4Ptn_91_Concept1Ptn_42_Concept2Ptn_93_", + "tgt": "_91_Concept1Ptn_42_Concept2Ptn_93_" + }, + { + "src": "relatie2Ptn_91_Concept0Ptn_42_Concept0Ptn_93_", + "tgt": "_91_Concept0Ptn_42_Concept0Ptn_93_" + }, + { + "src": "relatie5Ptn_91_Concept3Ptn_42_Concept2Ptn_93_", + "tgt": "_91_Concept3Ptn_42_Concept2Ptn_93_" + } + ], + "relation": "sign[Relation*Signature]" + }, + { + "links": [ + { + "src": "EDcD_32_relatie6Ptn_91_Concept1Ptn_42_Concept3Ptn_#-4076201424342764243#", + "tgt": "_91_Concept1Ptn_42_Concept3Ptn_93_" + } + ], + "relation": "sign[Term*Signature]" + }, + { + "links": [], + "relation": "singleton[Singleton*AtomValue]" + }, + { + "links": [], + "relation": "snd[CombineStrings*String]" + }, + { + "links": [ + { + "src": "relatie1Ptn_91_Concept0Ptn_42_Concept0Ptn_93_", + "tgt": "Concept0Ptn" + }, + { + "src": "relatie6Ptn_91_Concept1Ptn_42_Concept3Ptn_93_", + "tgt": "Concept1Ptn" + }, + { + "src": "relatie7Ptn_91_Concept4Ptn_42_Concept3Ptn_93_", + "tgt": "Concept4Ptn" + }, + { + "src": "relatie4Ptn_91_Concept1Ptn_42_Concept2Ptn_93_", + "tgt": "Concept1Ptn" + }, + { + "src": "relatie2Ptn_91_Concept0Ptn_42_Concept0Ptn_93_", + "tgt": "Concept0Ptn" + }, + { + "src": "relatie5Ptn_91_Concept3Ptn_42_Concept2Ptn_93_", + "tgt": "Concept3Ptn" + } + ], + "relation": "source[Relation*Concept]" + }, + { + "links": [ + { + "src": "_91_Concept3Ptn_42_Concept2Ptn_93_", + "tgt": "Concept3Ptn" + }, + { + "src": "_91_Concept0Ptn_42_Concept0Ptn_93_", + "tgt": "Concept0Ptn" + }, + { + "src": "_91_Concept1Ptn_42_Concept3Ptn_93_", + "tgt": "Concept1Ptn" + }, + { + "src": "_91_Concept4Ptn_42_Concept3Ptn_93_", + "tgt": "Concept4Ptn" + }, + { + "src": "_91_Concept1Ptn_42_Concept2Ptn_93_", + "tgt": "Concept1Ptn" + } + ], + "relation": "src[Signature*Concept]" + }, + { + "links": [], + "relation": "srcOrTgt[PairViewSegment*SourceOrTarget]" + }, + { + "links": [ + { + "src": "relatie1Ptn_91_Concept0Ptn_42_Concept0Ptn_93_", + "tgt": "Concept0Ptn" + }, + { + "src": "relatie6Ptn_91_Concept1Ptn_42_Concept3Ptn_93_", + "tgt": "Concept3Ptn" + }, + { + "src": "relatie7Ptn_91_Concept4Ptn_42_Concept3Ptn_93_", + "tgt": "Concept3Ptn" + }, + { + "src": "relatie4Ptn_91_Concept1Ptn_42_Concept2Ptn_93_", + "tgt": "Concept2Ptn" + }, + { + "src": "relatie2Ptn_91_Concept0Ptn_42_Concept0Ptn_93_", + "tgt": "Concept0Ptn" + }, + { + "src": "relatie5Ptn_91_Concept3Ptn_42_Concept2Ptn_93_", + "tgt": "Concept2Ptn" + } + ], + "relation": "target[Relation*Concept]" + }, + { + "links": [], + "relation": "text[BxTxt*Text]" + }, + { + "links": [ + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#-798934108058446600#", + "tgt": "this is the purpose of the CONCEPT ConceptPtn, gedefineerd in de PATTERN" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#780419289325136719#", + "tgt": "this is the definition of CONCEPT Concept1Ptn in de PATTERN" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#6957948246529230050#", + "tgt": "this is the meaning of the RELATION relatie1Ptn, gedefineerd in de PATTERN" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#3565108094868953990#", + "tgt": "this is the purpose of the PATTERN PatternName, gedefineerd in de PATTERN" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#-3596564259022656172#", + "tgt": "this is the meaning of the RELATION relatie7Ptn, gedefineerd in de PATTERN" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#-4416761693972881498#", + "tgt": "this is the definition of CONCEPT Concept4Ptn in de PATTERN" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#6607581912605832750#", + "tgt": "this is the meaning of the RELATION relatie5Ptn, gedefineerd in de PATTERN" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#9033086796309510097#", + "tgt": "this is the definition of CONCEPT Concept3Ptn in de PATTERN" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#-3114025089730486240#", + "tgt": "this is the meaning of the RULE Rule2Ptn, gedefineerd in de PATTERN" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#7881207238937330204#", + "tgt": "this is the definition of CONCEPT Concept2Ptn in de PATTERN" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#977393125919530039#", + "tgt": "this is the meaning of the RELATION relatie6Ptn, gedefineerd in de PATTERN" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#6995093958773664282#", + "tgt": "this is the definition of CONCEPT Concept0Ptn in de PATTERN" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#-1656354467933384191#", + "tgt": "this is the purpose of the RELATION relatie1Ptn, gedefineerd in de PATTERN" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#-1999658074228190521#", + "tgt": "Definition not provided" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#2154374317484107883#", + "tgt": "this is the meaning of the RELATION relatie2Ptn, gedefineerd in de PATTERN" + }, + { + "src": "Markup_32__123_amLang_32__61__32_English_44__32_am#-7158099665861021703#", + "tgt": "this is the meaning of the RELATION relatie4Ptn, gedefineerd in de PATTERN" + } + ], + "relation": "text[Markup*MarkupText]" + }, + { + "links": [], + "relation": "text[PairViewSegment*String]" + }, + { + "links": [ + { + "src": "_91_Concept3Ptn_42_Concept2Ptn_93_", + "tgt": "Concept2Ptn" + }, + { + "src": "_91_Concept0Ptn_42_Concept0Ptn_93_", + "tgt": "Concept0Ptn" + }, + { + "src": "_91_Concept1Ptn_42_Concept3Ptn_93_", + "tgt": "Concept3Ptn" + }, + { + "src": "_91_Concept4Ptn_42_Concept3Ptn_93_", + "tgt": "Concept3Ptn" + }, + { + "src": "_91_Concept1Ptn_42_Concept2Ptn_93_", + "tgt": "Concept2Ptn" + } + ], + "relation": "tgt[Signature*Concept]" + }, + { + "links": [ + { + "src": "Rule2Ptn", + "tgt": "ContextName" + } + ], + "relation": "udefrules[Rule*Context]" + }, + { + "links": [ + { + "src": "Rule2Ptn", + "tgt": "PatternName" + } + ], + "relation": "udefrules[Rule*Pattern]" + }, + { + "links": [ + { + "src": "ONE", + "tgt": "ONE" + }, + { + "src": "Concept2Ptn", + "tgt": "Concept2Ptn" + }, + { + "src": "Concept3Ptn", + "tgt": "Concept3Ptn" + }, + { + "src": "Concept0Ptn", + "tgt": "Concept0Ptn" + }, + { + "src": "Concept1Ptn", + "tgt": "Concept1Ptn" + }, + { + "src": "Concept4Ptn", + "tgt": "Concept4Ptn" + } + ], + "relation": "urlEncodedName[Concept*EncodedName]" + }, + { + "links": [ + { + "src": "PatternName", + "tgt": "PatternName" + } + ], + "relation": "urlEncodedName[Pattern*EncodedName]" + }, + { + "links": [ + { + "src": "Rule2Ptn", + "tgt": "Rule2Ptn" + } + ], + "relation": "urlEncodedName[Rule*EncodedName]" + }, + { + "links": [ + { + "src": "relatie6Ptn_91_Concept1Ptn_42_Concept3Ptn_93_", + "tgt": "EDcD_32_relatie6Ptn_91_Concept1Ptn_42_Concept3Ptn_#-4076201424342764243#" + } + ], + "relation": "usedIn[Relation*Term]" + }, + { + "links": [], + "relation": "userCpt[Epsilon*Concept]" + }, + { + "links": [], + "relation": "userSrc[V*Concept]" + }, + { + "links": [], + "relation": "userTgt[V*Concept]" + }, + { + "links": [ + { + "src": "ContextName", + "tgt": "PatternName" + } + ], + "relation": "uses[Context*Pattern]" + }, + { + "links": [], + "relation": "valid[Concept*Context]" + }, + { + "links": [], + "relation": "valid[Relation*Context]" + }, + { + "links": [], + "relation": "valid[Rule*Context]" + }, + { + "links": [ + { + "src": "ContextName", + "tgt": "Ampersand-v4.8.0 [Add-prop-BIJ-FUN:513215c8f*], build time: 03-Jul-24 15:52:27 CEST" + } + ], + "relation": "versionInfo[Context*AmpersandVersion]" + }, + { + "links": [], + "relation": "violatable[Interface*Rule]" + } + ] +} \ No newline at end of file diff --git a/src/Ampersand/ADL1/P2A_Converters.hs b/src/Ampersand/ADL1/P2A_Converters.hs index 8e98a51ac..ab39e2ef2 100644 --- a/src/Ampersand/ADL1/P2A_Converters.hs +++ b/src/Ampersand/ADL1/P2A_Converters.hs @@ -1333,6 +1333,8 @@ pDecl2aDecl typ cptMap maybePatName defLanguage defFormat pd = P_Rfx -> [Rfx] P_Irf -> [Irf] P_Prop -> [Sym, Asy] + P_Fun -> [Uni, Tot] + P_Bij -> [Inj, Sur] decSign = pSign2aSign cptMap (dec_sign pd) checkEndoProps :: Guarded () diff --git a/src/Ampersand/ADL1/PrettyPrinters.hs b/src/Ampersand/ADL1/PrettyPrinters.hs index 22da4f152..391a19c87 100644 --- a/src/Ampersand/ADL1/PrettyPrinters.hs +++ b/src/Ampersand/ADL1/PrettyPrinters.hs @@ -488,6 +488,8 @@ instance Pretty PProp where P_Rfx -> text "RFX" P_Irf -> text "IRF" P_Prop -> text "SYM, ASY" + P_Fun -> text "UNI, TOT" + P_Bij -> text "INJ, SUR" -- _ -> text . map toUpper . show $ p diff --git a/src/Ampersand/Commands/AtlasImport.hs b/src/Ampersand/Commands/AtlasImport.hs index d270846d6..b93cdde62 100644 --- a/src/Ampersand/Commands/AtlasImport.hs +++ b/src/Ampersand/Commands/AtlasImport.hs @@ -308,6 +308,8 @@ instance JSON.FromJSON PProp where "rfx" -> pure P_Rfx "irf" -> pure P_Irf "prop" -> pure P_Prop + "fun" -> pure P_Fun + "bij" -> pure P_Bij _ -> JSON.unexpected val invalid -> diff --git a/src/Ampersand/Core/A2P_Converters.hs b/src/Ampersand/Core/A2P_Converters.hs index 9399aba1e..b06f59e6c 100644 --- a/src/Ampersand/Core/A2P_Converters.hs +++ b/src/Ampersand/Core/A2P_Converters.hs @@ -129,6 +129,16 @@ aProps2Pprops aps && P_Asy `elem` xs = Set.singleton P_Prop `Set.union` (xs Set.\\ Set.fromList [P_Sym, P_Asy]) + | P_Uni + `elem` xs + && P_Tot + `elem` xs = + Set.singleton P_Fun `Set.union` (xs Set.\\ Set.fromList [P_Uni, P_Tot]) + | P_Inj + `elem` xs + && P_Sur + `elem` xs = + Set.singleton P_Bij `Set.union` (xs Set.\\ Set.fromList [P_Inj, P_Sur]) | otherwise = xs where xs = Set.map aProp2pProp aps diff --git a/src/Ampersand/Core/ParseTree.hs b/src/Ampersand/Core/ParseTree.hs index 759efde59..61cc55d02 100644 --- a/src/Ampersand/Core/ParseTree.hs +++ b/src/Ampersand/Core/ParseTree.hs @@ -1259,6 +1259,10 @@ data PProp P_Irf | -- | PROP keyword, the parser must replace this by [Sym, Asy]. P_Prop + | -- | FUN keyword, the parser must replace this by [Uni, Tot]. + P_Fun + | -- | BIJ keyword, the parser must replace this by [Inj, Sur]. + P_Bij deriving (Eq, Ord, Typeable, Data, Enum, Bounded) instance Show PProp where @@ -1272,6 +1276,8 @@ instance Show PProp where show P_Rfx = "RFX" show P_Irf = "IRF" show P_Prop = "PROP" + show P_Fun = "FUN" + show P_Bij = "BIJ" instance Unique PProp where showUnique = tshow