Skip to content

Commit

Permalink
generic term rewriting and function evaluation
Browse files Browse the repository at this point in the history
  • Loading branch information
@JornBettin
JornBettin committed Mar 30, 2012
1 parent aaf4f0b commit 7ab403a
Show file tree
Hide file tree
Showing 14 changed files with 112 additions and 232 deletions.
10 changes: 5 additions & 5 deletions ...ests/src/main/java/org/s23m/cell/kernel/artifactinstantiation/InstantiationSequences.java
View file
Expand Up @@ -112,7 +112,7 @@ public void visualizationExample() {
final Set crm_viz_visibilities = crm_aviz.addConcrete(Visualization.visibilities, final Set crm_viz_visibilities = crm_aviz.addConcrete(Visualization.visibilities,
addDisjunctSemanticIdentitySet("crm schema visualizedGraph | visibilities", "crm schema visualizedGraph | visibilities", testDomain)); addDisjunctSemanticIdentitySet("crm schema visualizedGraph | visibilities", "crm schema visualizedGraph | visibilities", testDomain));


// add diagram information // addPrivilege diagram information
final Set crm_viz_structure_diag = crm_aviz.addConcrete(Visualization.diagram, final Set crm_viz_structure_diag = crm_aviz.addConcrete(Visualization.diagram,
addDisjunctSemanticIdentitySet("crm schema visualizedGraph | structure diag 1", "crm schema visualizedGraph | structure diag 1", testDomain)); addDisjunctSemanticIdentitySet("crm schema visualizedGraph | structure diag 1", "crm schema visualizedGraph | structure diag 1", testDomain));
arrow(Visualization.visualizedAspect_to_diagram, arrow(Visualization.visualizedAspect_to_diagram,
Expand All @@ -124,7 +124,7 @@ public void visualizationExample() {
S23MSemanticDomains.minCardinality_NOTAPPLICABLE, S23MSemanticDomains.maxCardinality_NOTAPPLICABLE, S23MSemanticDomains.isNavigable_NOTAPPLICABLE, S23MSemanticDomains.isContainer_FALSE S23MSemanticDomains.minCardinality_NOTAPPLICABLE, S23MSemanticDomains.maxCardinality_NOTAPPLICABLE, S23MSemanticDomains.isNavigable_NOTAPPLICABLE, S23MSemanticDomains.isContainer_FALSE
); );


// add representation information // addPrivilege representation information
crm_viz_structure_diag_product = crm_aviz.addConcrete(Visualization.representation, crm_viz_structure_diag_product = crm_aviz.addConcrete(Visualization.representation,
addDisjunctSemanticIdentitySet("crm schema visualizedGraph | structure diag 1 | product", "crm schema visualizedGraph | structure diag 1 | product", testDomain)); addDisjunctSemanticIdentitySet("crm schema visualizedGraph | structure diag 1 | product", "crm schema visualizedGraph | structure diag 1 | product", testDomain));
arrow(Visualization.diagram_to_representation, arrow(Visualization.diagram_to_representation,
Expand All @@ -135,7 +135,7 @@ public void visualizationExample() {
crm_viz_structure_diag_product, crm_viz_structure_diag_product,
S23MSemanticDomains.minCardinality_NOTAPPLICABLE, S23MSemanticDomains.maxCardinality_NOTAPPLICABLE, S23MSemanticDomains.isNavigable_NOTAPPLICABLE, S23MSemanticDomains.isContainer_FALSE S23MSemanticDomains.minCardinality_NOTAPPLICABLE, S23MSemanticDomains.maxCardinality_NOTAPPLICABLE, S23MSemanticDomains.isNavigable_NOTAPPLICABLE, S23MSemanticDomains.isContainer_FALSE
); );
// add icon to representation // addPrivilege icon to representation
final Set crm_viz_structure_diag_product_icon = crm_aviz.addConcrete(Visualization.symbol, final Set crm_viz_structure_diag_product_icon = crm_aviz.addConcrete(Visualization.symbol,
addDisjunctSemanticIdentitySet("crm schema visualizedGraph | structure diag 1 | product icon", "crm schema visualizedGraph | structure diag 1 | product icon", testDomain)); addDisjunctSemanticIdentitySet("crm schema visualizedGraph | structure diag 1 | product icon", "crm schema visualizedGraph | structure diag 1 | product icon", testDomain));
crm_viz_structure_diag_product_icon.identity().setPayload("here goes the content of the icon file"); crm_viz_structure_diag_product_icon.identity().setPayload("here goes the content of the icon file");
Expand All @@ -147,7 +147,7 @@ public void visualizationExample() {
crm_viz_structure_diag_product.semanticIdentity(), crm_viz_structure_diag_product.semanticIdentity(),
S23MSemanticDomains.minCardinality_NOTAPPLICABLE, S23MSemanticDomains.maxCardinality_NOTAPPLICABLE, S23MSemanticDomains.isNavigable_NOTAPPLICABLE, S23MSemanticDomains.isContainer_FALSE S23MSemanticDomains.minCardinality_NOTAPPLICABLE, S23MSemanticDomains.maxCardinality_NOTAPPLICABLE, S23MSemanticDomains.isNavigable_NOTAPPLICABLE, S23MSemanticDomains.isContainer_FALSE
); );
// add coordinates to representation // addPrivilege coordinates to representation
final Set crm_viz_structure_diag_product_x = crm_aviz.addConcrete(Visualization.x, final Set crm_viz_structure_diag_product_x = crm_aviz.addConcrete(Visualization.x,
addDisjunctSemanticIdentitySet("crm schema visualizedGraph | structure diag 1 | product x", "crm schema visualizedGraph | structure diag 1 | product x", testDomain)); addDisjunctSemanticIdentitySet("crm schema visualizedGraph | structure diag 1 | product x", "crm schema visualizedGraph | structure diag 1 | product x", testDomain));
crm_viz_structure_diag_product_x.identity().setPayload("57"); crm_viz_structure_diag_product_x.identity().setPayload("57");
Expand Down Expand Up @@ -245,7 +245,7 @@ public void addIcon(final Set semanticIdentity, final String iconFile) {
} }




// add icon to representation // addPrivilege icon to representation
for (final Set s_to_si : graphVisualization.filterPolymorphic(Visualization.symbol_to_semantic_identity)) { for (final Set s_to_si : graphVisualization.filterPolymorphic(Visualization.symbol_to_semantic_identity)) {
if (s_to_si.to().isEqualTo(semanticIdentity) if (s_to_si.to().isEqualTo(semanticIdentity)
&& s_to_si.toEdgeEnd().isEqualTo(semanticIdentity) ) { && s_to_si.toEdgeEnd().isEqualTo(semanticIdentity) ) {
Expand Down
8 changes: 4 additions & 4 deletions ....cell.kernel.tests/src/main/java/org/s23m/cell/kernel/tests/VisualisationExampleTest.java
View file
Expand Up @@ -29,7 +29,7 @@ protected void executeInstantiationSequence() {
final Set crm_viz_visibilities = crm_aviz.addConcrete(Visualization.visibilities, final Set crm_viz_visibilities = crm_aviz.addConcrete(Visualization.visibilities,
Instantiation.addDisjunctSemanticIdentitySet("crm schema visualizedGraph | visibilities", "crm schema visualizedGraph | visibilities", testDomain)); Instantiation.addDisjunctSemanticIdentitySet("crm schema visualizedGraph | visibilities", "crm schema visualizedGraph | visibilities", testDomain));


// add diagram information // addPrivilege diagram information
final Set crm_viz_structure_diag = crm_aviz.addConcrete(Visualization.diagram, final Set crm_viz_structure_diag = crm_aviz.addConcrete(Visualization.diagram,
Instantiation.addDisjunctSemanticIdentitySet("crm schema visualizedGraph | structure diag 1", "crm schema visualizedGraph | structure diag 1", testDomain)); Instantiation.addDisjunctSemanticIdentitySet("crm schema visualizedGraph | structure diag 1", "crm schema visualizedGraph | structure diag 1", testDomain));
Instantiation.arrow(Visualization.visualizedAspect_to_diagram, Instantiation.arrow(Visualization.visualizedAspect_to_diagram,
Expand All @@ -41,7 +41,7 @@ protected void executeInstantiationSequence() {
S23MSemanticDomains.minCardinality_NOTAPPLICABLE, S23MSemanticDomains.maxCardinality_NOTAPPLICABLE, S23MSemanticDomains.isNavigable_NOTAPPLICABLE, S23MSemanticDomains.isContainer_FALSE S23MSemanticDomains.minCardinality_NOTAPPLICABLE, S23MSemanticDomains.maxCardinality_NOTAPPLICABLE, S23MSemanticDomains.isNavigable_NOTAPPLICABLE, S23MSemanticDomains.isContainer_FALSE
); );


// add representation information // addPrivilege representation information
final Set crm_viz_structure_diag_product = crm_aviz.addConcrete(Visualization.representation, final Set crm_viz_structure_diag_product = crm_aviz.addConcrete(Visualization.representation,
Instantiation.addDisjunctSemanticIdentitySet("crm schema visualizedGraph | structure diag 1 | product", "crm schema visualizedGraph | structure diag 1 | product", testDomain)); Instantiation.addDisjunctSemanticIdentitySet("crm schema visualizedGraph | structure diag 1 | product", "crm schema visualizedGraph | structure diag 1 | product", testDomain));
Instantiation.arrow(Visualization.diagram_to_representation, Instantiation.arrow(Visualization.diagram_to_representation,
Expand All @@ -52,7 +52,7 @@ protected void executeInstantiationSequence() {
crm_viz_structure_diag_product, crm_viz_structure_diag_product,
S23MSemanticDomains.minCardinality_NOTAPPLICABLE, S23MSemanticDomains.maxCardinality_NOTAPPLICABLE, S23MSemanticDomains.isNavigable_NOTAPPLICABLE, S23MSemanticDomains.isContainer_FALSE S23MSemanticDomains.minCardinality_NOTAPPLICABLE, S23MSemanticDomains.maxCardinality_NOTAPPLICABLE, S23MSemanticDomains.isNavigable_NOTAPPLICABLE, S23MSemanticDomains.isContainer_FALSE
); );
// add icon to representation // addPrivilege icon to representation
final Set crm_viz_structure_diag_product_icon = crm_aviz.addConcrete(Visualization.symbol, final Set crm_viz_structure_diag_product_icon = crm_aviz.addConcrete(Visualization.symbol,
Instantiation.addDisjunctSemanticIdentitySet("crm schema visualizedGraph | structure diag 1 | product icon", "crm schema visualizedGraph | structure diag 1 | product icon", testDomain)); Instantiation.addDisjunctSemanticIdentitySet("crm schema visualizedGraph | structure diag 1 | product icon", "crm schema visualizedGraph | structure diag 1 | product icon", testDomain));
crm_viz_structure_diag_product_icon.identity().setPayload("here goes the content of the icon file"); crm_viz_structure_diag_product_icon.identity().setPayload("here goes the content of the icon file");
Expand All @@ -64,7 +64,7 @@ protected void executeInstantiationSequence() {
crm_viz_structure_diag_product.semanticIdentity(), crm_viz_structure_diag_product.semanticIdentity(),
S23MSemanticDomains.minCardinality_NOTAPPLICABLE, S23MSemanticDomains.maxCardinality_NOTAPPLICABLE, S23MSemanticDomains.isNavigable_NOTAPPLICABLE, S23MSemanticDomains.isContainer_FALSE S23MSemanticDomains.minCardinality_NOTAPPLICABLE, S23MSemanticDomains.maxCardinality_NOTAPPLICABLE, S23MSemanticDomains.isNavigable_NOTAPPLICABLE, S23MSemanticDomains.isContainer_FALSE
); );
// add coordinates to representation // addPrivilege coordinates to representation
final Set crm_viz_structure_diag_product_x = crm_aviz.addConcrete(Visualization.x, final Set crm_viz_structure_diag_product_x = crm_aviz.addConcrete(Visualization.x,
Instantiation.addDisjunctSemanticIdentitySet("crm schema visualizedGraph | structure diag 1 | product x", "crm schema visualizedGraph | structure diag 1 | product x", testDomain)); Instantiation.addDisjunctSemanticIdentitySet("crm schema visualizedGraph | structure diag 1 | product x", "crm schema visualizedGraph | structure diag 1 | product x", testDomain));
crm_viz_structure_diag_product_x.identity().setPayload("57"); crm_viz_structure_diag_product_x.identity().setPayload("57");
Expand Down
2 changes: 1 addition & 1 deletion org.s23m.cell.kernel/src/main/java/org/s23m/cell/core/F_Instantiation.java
View file
Expand Up @@ -194,7 +194,7 @@ public static Vertex instantiateConcrete(final Identity semanticIdentity, final
&& SemanticDomain.semanticdomain.isSuperSetOf(category).is_FALSE() && SemanticDomain.semanticdomain.isSuperSetOf(category).is_FALSE()
&& SemanticStateOfInMemoryModel.semanticDomainIsInitialized() && SemanticStateOfInMemoryModel.semanticDomainIsInitialized()
) { ) {
if ((category).value(coreSets.isAbstract).isEqualTo( coreSets.isAbstract_FALSE) ) { if (category.value(coreSets.isAbstract).isEqualTo( coreSets.isAbstract_FALSE) ) {
final Vertex temp; final Vertex temp;
temp = new Vertex((Graph) stage, semanticIdentity, category) ; temp = new Vertex((Graph) stage, semanticIdentity, category) ;
temp.addToValues(coreSets.isAbstract_FALSE); temp.addToValues(coreSets.isAbstract_FALSE);
Expand Down
6 changes: 3 additions & 3 deletions org.s23m.cell.platform/src/main/java/org/s23m/cell/platform/api/FormulaEvaluation.java
View file
Expand Up @@ -43,7 +43,7 @@
import org.s23m.cell.platform.formulaProcessors.informationqualitylogic.Or; import org.s23m.cell.platform.formulaProcessors.informationqualitylogic.Or;
import org.s23m.cell.platform.formulaProcessors.informationqualitylogic.Xor; import org.s23m.cell.platform.formulaProcessors.informationqualitylogic.Xor;
import org.s23m.cell.platform.models.CellEngineering; import org.s23m.cell.platform.models.CellEngineering;
import org.s23m.cell.platform.models.CellPlatform; import org.s23m.cell.platform.models.CellPlatformAgent;
import org.s23m.cell.platform.models.CellPlatformDomain; import org.s23m.cell.platform.models.CellPlatformDomain;
import org.s23m.cell.platform.models.Formula; import org.s23m.cell.platform.models.Formula;
import org.s23m.cell.platform.models.LogicalFormula; import org.s23m.cell.platform.models.LogicalFormula;
Expand Down Expand Up @@ -84,7 +84,7 @@ public static final Set evaluate(final Set formula, final Set values) {


if (CellEngineering.formula.isSuperSetOf(formula.category()).is_TRUE()) { if (CellEngineering.formula.isSuperSetOf(formula.category()).is_TRUE()) {
// fetch the proper subformula that constitutes the root of the formula // fetch the proper subformula that constitutes the root of the formula
subFormula = formula.filter(Formula.literal_to_properSubFormula).extractFirst().to(); subFormula = formula.extractUniqueMatch(CellPlatformDomain.literal);
} else { } else {
subFormula = formula; subFormula = formula;
} }
Expand Down Expand Up @@ -200,7 +200,7 @@ public static final Set evaluateSubFormula(final Set subFormula, final Arity ari
+ CellPlatformDomain.openSquareBracket.identity().name() + CellPlatformDomain.openSquareBracket.identity().name()
+ subFormula.container().identity().name() + subFormula.container().identity().name()
+ CellPlatformDomain.closeSquareBracket.identity().name() + CellPlatformDomain.closeSquareBracket.identity().name()
, org.s23m.cell.platform.api.Instantiation.toSemanticDomain(CellPlatform.development)); , org.s23m.cell.platform.api.Instantiation.toSemanticDomain(CellPlatformAgent.development));


return FormulaEvaluation.addSubFormula(subFormula.container(), subFormula.category(), si, terms, variables, constants); return FormulaEvaluation.addSubFormula(subFormula.container(), subFormula.category(), si, terms, variables, constants);
} }
Expand Down
9 changes: 8 additions & 1 deletion org.s23m.cell.platform/src/main/java/org/s23m/cell/platform/api/Instantiation.java
View file
Expand Up @@ -125,13 +125,20 @@ private static Set addDefaultContainers(final Set stage) {
final Set terminologies = org.s23m.cell.platform.api.Instantiation.instantiateConcrete(CellEngineering.terminology, stage, CellPlatformDomain.terminologies); final Set terminologies = org.s23m.cell.platform.api.Instantiation.instantiateConcrete(CellEngineering.terminology, stage, CellPlatformDomain.terminologies);
final Set cellVisualizatons = org.s23m.cell.platform.api.Instantiation.instantiateConcrete(Visualization.graphVisualization, stage, CellPlatformDomain.cellVisualizations); final Set cellVisualizatons = org.s23m.cell.platform.api.Instantiation.instantiateConcrete(Visualization.graphVisualization, stage, CellPlatformDomain.cellVisualizations);
final Set cells = org.s23m.cell.platform.api.Instantiation.instantiateConcrete(CellEngineering.organization, stage, CellPlatformDomain.cells); final Set cells = org.s23m.cell.platform.api.Instantiation.instantiateConcrete(CellEngineering.organization, stage, CellPlatformDomain.cells);
final Set formulas = org.s23m.cell.platform.api.Instantiation.instantiateConcrete(CellEngineering.formula, stage, CellPlatformDomain.formulas);


org.s23m.cell.platform.api.Instantiation.arrow(coreGraphs.visibility, cells, languages); org.s23m.cell.platform.api.Instantiation.arrow(coreGraphs.visibility, cells, languages);
org.s23m.cell.platform.api.Instantiation.arrow(coreGraphs.visibility, cells, time); org.s23m.cell.platform.api.Instantiation.arrow(coreGraphs.visibility, cells, time);
org.s23m.cell.platform.api.Instantiation.arrow(coreGraphs.visibility, cells, locations); org.s23m.cell.platform.api.Instantiation.arrow(coreGraphs.visibility, cells, locations);
org.s23m.cell.platform.api.Instantiation.arrow(coreGraphs.visibility, cells, terminologies); org.s23m.cell.platform.api.Instantiation.arrow(coreGraphs.visibility, cells, terminologies);
org.s23m.cell.platform.api.Instantiation.arrow(coreGraphs.visibility, cells, contracts); org.s23m.cell.platform.api.Instantiation.arrow(coreGraphs.visibility, cells, contracts);
return stage; org.s23m.cell.platform.api.Instantiation.arrow(coreGraphs.visibility, formulas, cells);
org.s23m.cell.platform.api.Instantiation.arrow(coreGraphs.visibility, formulas, languages);
org.s23m.cell.platform.api.Instantiation.arrow(coreGraphs.visibility, formulas, time);
org.s23m.cell.platform.api.Instantiation.arrow(coreGraphs.visibility, formulas, locations);
org.s23m.cell.platform.api.Instantiation.arrow(coreGraphs.visibility, formulas, terminologies);
org.s23m.cell.platform.api.Instantiation.arrow(coreGraphs.visibility, formulas, contracts);
return stage;
} }


public static Set toSemanticDomain(final Set set) { public static Set toSemanticDomain(final Set set) {
Expand Down
4 changes: 2 additions & 2 deletions ...ell.platform/src/main/java/org/s23m/cell/platform/formulaProcessors/FormulaEvaluator.java
View file
@@ -1,7 +1,7 @@
package org.s23m.cell.platform.formulaProcessors; package org.s23m.cell.platform.formulaProcessors;


import org.s23m.cell.Set; import org.s23m.cell.Set;
import org.s23m.cell.platform.models.CellPlatform; import org.s23m.cell.platform.models.CellPlatformAgent;
import org.s23m.cell.platform.models.CellPlatformDomain; import org.s23m.cell.platform.models.CellPlatformDomain;




Expand Down Expand Up @@ -57,6 +57,6 @@ protected Set generateSemanticIdentityForEvaluationResult() {
+ CellPlatformDomain.openSquareBracket.identity().name() + CellPlatformDomain.openSquareBracket.identity().name()
+ this.subFormula.identity().name() + this.subFormula.identity().name()
+ CellPlatformDomain.closeSquareBracket.identity().name() + CellPlatformDomain.closeSquareBracket.identity().name()
, org.s23m.cell.platform.api.Instantiation.toSemanticDomain(CellPlatform.development)); , org.s23m.cell.platform.api.Instantiation.toSemanticDomain(CellPlatformAgent.development));
} }
} }
180 changes: 0 additions & 180 deletions org.s23m.cell.platform/src/main/java/org/s23m/cell/platform/models/CellContent.java
View file

This file was deleted.

4 changes: 2 additions & 2 deletions org.s23m.cell.platform/src/main/java/org/s23m/cell/platform/models/CellEngineering.java
View file
Expand Up @@ -55,8 +55,8 @@ public final class CellEngineering {
public static final Set organization = Root.cellengineering.addConcrete(TimeConsciousness.timeConsciousVertex, CellPlatformDomain.organization); public static final Set organization = Root.cellengineering.addConcrete(TimeConsciousness.timeConsciousVertex, CellPlatformDomain.organization);
private static final Set s2 = Instantiation.arrow(coreGraphs.superSetReference, organization, TimeConsciousness.timeConsciousVertex); private static final Set s2 = Instantiation.arrow(coreGraphs.superSetReference, organization, TimeConsciousness.timeConsciousVertex);


public static final Set formula = Root.cellengineering.addAbstract(Organization.cell, CellPlatformDomain.formula); public static final Set formula = Root.cellengineering.addConcrete(Organization.cell, CellPlatformDomain.formula);
public static final Set logicalFormula = Root.cellengineering.addAbstract(Organization.cell, CellPlatformDomain.logicalFormula); public static final Set logicalFormula = Root.cellengineering.addConcrete(Organization.cell, CellPlatformDomain.logicalFormula);
private static final Set s3 = Instantiation.arrow(coreGraphs.superSetReference, formula, Organization.cell); private static final Set s3 = Instantiation.arrow(coreGraphs.superSetReference, formula, Organization.cell);
private static final Set s1 = Instantiation.arrow(coreGraphs.superSetReference, logicalFormula, formula); private static final Set s1 = Instantiation.arrow(coreGraphs.superSetReference, logicalFormula, formula);
private static final Set v1 = Instantiation.arrow(coreGraphs.visibility, logicalFormula, formula); private static final Set v1 = Instantiation.arrow(coreGraphs.visibility, logicalFormula, formula);
Expand Down

0 comments on commit 7ab403a

Please sign in to comment.