Skip to content

Commit

Permalink
atl developments
Browse files Browse the repository at this point in the history
  • Loading branch information
@nmacedo
nmacedo committed Mar 21, 2014
1 parent a8fe3a5 commit 3cc0b53
Show file tree
Hide file tree
Showing 8 changed files with 106 additions and 60 deletions.
14 changes: 8 additions & 6 deletions examples/pt.uminho.haslab.echo.examples/metamodels/hsm2nhsm/NHSM.ecore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,22 @@
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="NHSM" nsURI="NHSM" nsPrefix="nhsm">
<eClassifiers xsi:type="ecore:EClass" name="StateMachine">
<eStructuralFeatures xsi:type="ecore:EReference" name="states" upperBound="-1"
eType="#//State" containment="true" eOpposite="#//State/machine"/>
eType="ecore:EClass /pt.uminho.haslab.echo.examples/metamodels/hsm2nhsm/NHSM.ecore#//State"
containment="true" eOpposite="/pt.uminho.haslab.echo.examples/metamodels/hsm2nhsm/NHSM.ecore#//State/machine"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="transitions" upperBound="-1"
eType="#//Transition" containment="true"/>
eType="ecore:EClass /pt.uminho.haslab.echo.examples/metamodels/hsm2nhsm/NHSM.ecore#//Transition"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="State">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="machine" eType="#//StateMachine"
eOpposite="#//StateMachine/states"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="machine" eType="ecore:EClass /pt.uminho.haslab.echo.examples/metamodels/hsm2nhsm/NHSM.ecore#//StateMachine"
eOpposite="/pt.uminho.haslab.echo.examples/metamodels/hsm2nhsm/NHSM.ecore#//StateMachine/states"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Transition">
<eStructuralFeatures xsi:type="ecore:EReference" name="source" lowerBound="1"
eType="#//State"/>
eType="ecore:EClass /pt.uminho.haslab.echo.examples/metamodels/hsm2nhsm/NHSM.ecore#//State"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
eType="#//State"/>
eType="ecore:EClass /pt.uminho.haslab.echo.examples/metamodels/hsm2nhsm/NHSM.ecore#//State"/>
</eClassifiers>
</ecore:EPackage>
9 changes: 1 addition & 8 deletions examples/pt.uminho.haslab.echo.examples/models/hsm2nhsm/NHM_example.xmi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,5 @@
xmlns:nhsm="NHSM"
xsi:schemaLocation="NHSM /pt.uminho.haslab.echo.examples/metamodels/hsm2nhsm/NHSM.ecore"
name="machine">
<states name="Idle"/>
<states name="Active"/>
<transitions
source="//@states.0"
target="//@states.1"/>
<transitions
source="//@states.1"
target="//@states.0"/>
<states name="X"/>
</nhsm:StateMachine>
29 changes: 20 additions & 9 deletions ...ins/pt.uminho.haslab.echo/src/pt/uminho/haslab/echo/engine/alloy/AlloyEchoTranslator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
import pt.uminho.haslab.mde.transformation.EModelDomain;
import pt.uminho.haslab.mde.transformation.ERelation;
import pt.uminho.haslab.mde.transformation.ETransformation;
import pt.uminho.haslab.mde.transformation.atl.EATLTransformation;
import pt.uminho.haslab.mde.transformation.qvt.EQVTTransformation;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down Expand Up @@ -138,15 +140,24 @@ public void remMetaModel(String metamodelID) {
@Override
public void translateTransformation(ETransformation constraint) throws EchoError {
Map<String,List<EDependency>> deps = new HashMap<String,List<EDependency>>();
for (ERelation r : constraint.getRelations()) {
List<EDependency> aux2 = new ArrayList<EDependency>();
for (EModelDomain dom : r.getDomains()) {
List<EModelDomain> aux = new ArrayList<EModelDomain>(r.getDomains());
aux.remove(dom);
aux2.add(new EDependency(dom,aux,null));
}
deps.put(r.getName(),aux2);
}
// if (constraint instanceof EATLTransformation)
// for (ERelation r : constraint.getRelations()) {
// List<EDependency> aux2 = new ArrayList<>();
// List<EModelDomain> aux = new ArrayList<>();
// aux.add(r.getDomains().get(0));
// aux2.add(new EDependency(r.getDomains().get(1),aux,null));
// deps.put(r.getName(),aux2);
// }
// else
for (ERelation r : constraint.getRelations()) {
List<EDependency> aux2 = new ArrayList<EDependency>();
for (EModelDomain dom : r.getDomains()) {
List<EModelDomain> aux = new ArrayList<EModelDomain>(r.getDomains());
aux.remove(dom);
aux2.add(new EDependency(dom,aux,null));
}
deps.put(r.getName(),aux2);
}
translateTransformation(constraint,deps);
}

Expand Down
55 changes: 45 additions & 10 deletions ...ns/pt.uminho.haslab.echo/src/pt/uminho/haslab/echo/engine/alloy/EAlloyTransformation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,21 @@
import edu.mit.csail.sdg.alloy4compiler.ast.Sig.Field;
import pt.uminho.haslab.echo.EchoError;
import pt.uminho.haslab.echo.EchoReporter;
import pt.uminho.haslab.echo.ErrorUnsupported;
import pt.uminho.haslab.echo.EchoRunner.Task;
import pt.uminho.haslab.echo.ErrorInternalEngine;
import pt.uminho.haslab.echo.engine.EchoHelper;
import pt.uminho.haslab.echo.engine.EchoTranslator;
import pt.uminho.haslab.echo.engine.ITContext;
import pt.uminho.haslab.echo.engine.ast.Constants;
import pt.uminho.haslab.echo.engine.ast.EEngineRelation;
import pt.uminho.haslab.echo.engine.ast.EEngineRelation.Mode;
import pt.uminho.haslab.echo.engine.ast.EEngineTransformation;
import pt.uminho.haslab.echo.engine.ast.IDecl;
import pt.uminho.haslab.echo.engine.ast.IExpression;
import pt.uminho.haslab.echo.engine.ast.IFormula;
import pt.uminho.haslab.mde.transformation.EDependency;
import pt.uminho.haslab.mde.transformation.EModelDomain;
import pt.uminho.haslab.mde.transformation.EModelParameter;
import pt.uminho.haslab.mde.transformation.ERelation;
import pt.uminho.haslab.mde.transformation.ETransformation;
Expand Down Expand Up @@ -47,6 +51,8 @@ class EAlloyTransformation extends EEngineTransformation {

/** the Alloy functions defining top-relation constraints */
private Map<String, Func> topRelationConstraints;

private Field trace;

/**
* the Alloy declarations denoting the transformation parameters used in the
Expand Down Expand Up @@ -107,6 +113,15 @@ protected void processConstraint() throws ErrorAlloy {
if (subRelationDefs != null)
for (Func f : subRelationDefs.values())
fact = fact.and(f.call(vars));

if (subRelationFields != null && trace != null) {
Expr aux = Sig.NONE.product(Sig.NONE);
for (Func f : subRelationFields.values())
aux = aux.plus(f.call(vars));
fact = fact.and((vars[1].join(vars[0].join(trace))).equal(aux));
}

EchoReporter.getInstance().debug("Transformation: "+fact);

// creates functions with transformation parameters
try {
Expand All @@ -125,7 +140,6 @@ protected void processConstraint() throws ErrorAlloy {
protected AlloyFormula getConstraint(List<String> modelIDs) {
// calls constraint function with the model's state sig
List<Expr> sigs = new ArrayList<Expr>();
EchoReporter.getInstance().debug("qvt: "+func.getBody());
for (String modelID : modelIDs) {
EAlloyModel mdl = (EAlloyModel) EchoTranslator.getInstance().getModel(modelID);
sigs.add(mdl.getModelSig());
Expand Down Expand Up @@ -165,6 +179,15 @@ protected void addSubRelationField(EEngineRelation relation, IExpression exp)
if (subRelationFields == null)
subRelationFields = new HashMap<String, Func>();

if (relation.mode == Mode.TOP_TRACEABILITY) {
String op = EchoHelper.relationFieldName(relation.relation, relation.dependency.getSources().get(0));
if (subRelationFields.get(op) != null) {
subRelationFields.put(EchoHelper.relationFieldName(
relation.relation, relation.dependency.target), subRelationFields.get(op));
return;
}
}

// creates a function that calls the sub-relation field with appropriate
// model parameters
List<Decl> decls = new ArrayList<Decl>();
Expand Down Expand Up @@ -240,22 +263,34 @@ public AlloyFormula callRelation(ERelation n, ITContext context,
}

@Override
public IExpression callAllRelation(ITContext context, IExpression param) {
if (subRelationFields == null) return Constants.EMPTY();

// applies the model parameters to the relation function
public IExpression callAllRelation(ITContext context, IExpression param) throws ErrorAlloy, ErrorUnsupported {

if (trace == null) addTrace();

Expr[] vars = new Expr[context.getModelExpressions().size()];
for (int i = 0; i < context.getModelExpressions().size(); i++)
vars[i] = ((AlloyExpression) context.getModelExpressions().get(i)).EXPR;

Expr exp = Sig.NONE;
// retrieves the relation field
for (Func f : subRelationFields.values())
exp = exp.plus(f.call(vars));

Expr exp = vars[1].join(vars[0].join(trace));

IExpression expp = new AlloyExpression(exp);

return param.join(expp);
}

protected void addTrace() throws ErrorAlloy, ErrorUnsupported {
if (modelParamDecls.size() > 2) throw new ErrorUnsupported("Traces between more than 2 models not yet supported.");
try {
Sig s0 = (Sig) (modelParamDecls.get(0).expr.type().toExpr());
Sig s1 = (Sig) (modelParamDecls.get(1).expr.type().toExpr());
trace = s0.addField("trace", s1.product(Sig.UNIV.product(Sig.UNIV)));
} catch (Err a) {
throw new ErrorAlloy(ErrorInternalEngine.FAIL_CREATE_FIELD,
"Failed to create relation field representation: "
+"trace", a,
Task.TRANSLATE_TRANSFORMATION);
}
}


}
44 changes: 23 additions & 21 deletions plugins/pt.uminho.haslab.echo/src/pt/uminho/haslab/echo/engine/ast/EEngineRelation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ public abstract class EEngineRelation {

/** the engine declarations of the root variables
* null if top call */
protected Map<String, IDecl> rootVar2engineDecl = new HashMap<>();
protected Map<String, IDecl> rootVarS2engineDecl = new HashMap<>();
protected Map<String, IDecl> rootVarT2engineDecl = new HashMap<>();
protected Map<String, IDecl> rootVar2engineDecl = new LinkedHashMap<>();
protected Map<String, IDecl> rootVarS2engineDecl = new LinkedHashMap<>();
protected Map<String, IDecl> rootVarT2engineDecl = new LinkedHashMap<>();

/** the root variables of the relation being translated*/
private Map<EVariable,String> rootvariables = new HashMap<>();
private Map<EVariable,String> rootvariablesS = new HashMap<>();
private Map<EVariable,String> rootvariablesT = new HashMap<>();
private Map<EVariable,String> rootvariables = new LinkedHashMap<>();
private Map<EVariable,String> rootvariablesS = new LinkedHashMap<>();
private Map<EVariable,String> rootvariablesT = new LinkedHashMap<>();

/** the target relation domain */
private EModelDomain targetdomain;
Expand All @@ -61,15 +61,15 @@ public abstract class EEngineRelation {

/** the engine declarations of the variables occurring in the when constraint
* if non-top relation, does not contain root variables*/
private Map<String,IDecl> whenVar2engineDecl = new HashMap<>();
private Map<String,IDecl> whenVar2engineDecl = new LinkedHashMap<>();

/** the engine declarations of the variables occurring in the source domain but not in the when constraint
* if non-top relation, does not contain root variables*/
private Map<String,IDecl> sourceVar2engineDecl = new HashMap<>();
private Map<String,IDecl> sourceVar2engineDecl = new LinkedHashMap<>();

/** the engine declarations of the variables occurring in the target domain and where constraint but not in the source domains and the when constraint constraint
* if non-top relation, does not contain root variables*/
private Map<String,IDecl> targetVar2engineDecl = new HashMap<>();
private Map<String,IDecl> targetVar2engineDecl = new LinkedHashMap<>();

public final IFormula constraint;

Expand All @@ -93,7 +93,7 @@ public EEngineRelation (ERelation relation, EEngineRelation parentRelation) thro
* @throws EchoError
*/
public EEngineRelation (ERelation relation, EDependency dependency, EEngineTransformation transformation, boolean trace) throws EchoError {
this (relation,trace?Mode.TOP_TRACEABILITY:Mode.TOP_QUANTIFIER,dependency,null,transformation);
this (relation,trace?(relation.isTop()?Mode.TOP_TRACEABILITY:Mode.SUB_TRACEABILITY):Mode.TOP_QUANTIFIER,dependency,null,transformation);
}

/**
Expand Down Expand Up @@ -147,9 +147,9 @@ private void initVariableLists() throws EchoError {
manageModelParams();

// retrieve the variables occurring in the predicates and assign them owning domains (if possible)
Map<EVariable,String> preVar2model = new HashMap<EVariable,String>();
Map<EVariable,String> sourceVar2model = new HashMap<EVariable,String>();
Map<EVariable,String> targetVar2model = new HashMap<EVariable,String>();
Map<EVariable,String> preVar2model = new LinkedHashMap<EVariable,String>();
Map<EVariable,String> sourceVar2model = new LinkedHashMap<EVariable,String>();
Map<EVariable,String> targetVar2model = new LinkedHashMap<EVariable,String>();

for (EModelDomain dom : relation.getDomains()) {
rootvariables.put(dom.getRootVariable(),dom.getModel().getName());
Expand Down Expand Up @@ -217,11 +217,11 @@ private void initVariableLists() throws EchoError {
}
}

EchoReporter.getInstance().debug("rootvarsS: "+rootvariablesS);
EchoReporter.getInstance().debug("rootvarsT: "+rootvariablesT);
EchoReporter.getInstance().debug("srcvars: "+sourceVar2model);
EchoReporter.getInstance().debug("trgvars: "+targetVar2model);
EchoReporter.getInstance().debug("prevars: "+preVar2model);
// EchoReporter.getInstance().debug("rootvarsS: "+rootvariablesS);
// EchoReporter.getInstance().debug("rootvarsT: "+rootvariablesT);
// EchoReporter.getInstance().debug("srcvars: "+sourceVar2model);
// EchoReporter.getInstance().debug("trgvars: "+targetVar2model);
// EchoReporter.getInstance().debug("prevars: "+preVar2model);

// embed retrieved variable in engine representation
sourceVar2engineDecl = createVarDecls(sourceVar2model,true);
Expand Down Expand Up @@ -315,7 +315,7 @@ else if (sourceVar2engineDecl.size() > 1) {

return formula;
}

/**
* Translates a predicate to an engine formula.
* @param predicate the predicate to be translated
Expand Down Expand Up @@ -344,14 +344,16 @@ private IFormula translateCondition(EPredicate predicate) throws EchoError {
protected Map<String, IDecl> createVarDecls(
Map<EVariable, String> var2model, boolean addContext)
throws EchoError {

if (addContext)
for (EVariable s : var2model.keySet())
context.setVarModel(s.getName(), var2model.get(s));

Map<String, IDecl> ivars = new HashMap<>();
Map<String, IDecl> ivars = new LinkedHashMap<>();
for (EVariable var : var2model.keySet())
ivars.put(var.getName(), context.getDecl(var, addContext));

EchoReporter.getInstance().debug("Created vars: "+ivars);
return ivars;
}

Expand All @@ -376,7 +378,7 @@ private void addRelationDef(IExpression field) throws EchoError {
if (relation.getDomains().size() > 2) throw new ErrorUnsupported("Calls between more than 2 models not yet supported.");
IDecl fst = rootVar2engineDecl.get(relation.getDomains().get(0).getRootVariable().getName());
IDecl snd = rootVar2engineDecl.get(relation.getDomains().get(1).getRootVariable().getName());
System.out.println(constraint.comprehension(fst,snd));
EchoReporter.getInstance().debug(relation.getName() + " defined by comprehension.");
IFormula e = field.eq(constraint.comprehension(fst,snd));
transformation.defineSubRelationField(this,e);
}
Expand Down
7 changes: 5 additions & 2 deletions ...ins/pt.uminho.haslab.echo/src/pt/uminho/haslab/echo/engine/ast/EEngineTransformation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
import pt.uminho.haslab.echo.EchoReporter;
import pt.uminho.haslab.echo.EchoRunner.Task;
import pt.uminho.haslab.echo.ErrorInternalEngine;
import pt.uminho.haslab.echo.ErrorUnsupported;
import pt.uminho.haslab.echo.engine.ITContext;
import pt.uminho.haslab.echo.engine.alloy.ErrorAlloy;
import pt.uminho.haslab.mde.transformation.EDependency;
import pt.uminho.haslab.mde.transformation.ERelation;
import pt.uminho.haslab.mde.transformation.ETransformation;
Expand Down Expand Up @@ -46,8 +48,9 @@ protected EEngineTransformation(ETransformation transformation,
initModelParams();

// translates each top relation
// in ATL all transformations (including lazy ones) must be translated at top-level due to implicit calls
for (ERelation rel : transformation.getRelations()) {
if (rel.isTop())
if (rel.isTop()||trace)
for (EDependency dep : dependencies.get(rel.getName()))
createRelation(rel, dep, trace);
}
Expand Down Expand Up @@ -147,6 +150,6 @@ public abstract IFormula callRelation(ERelation rel, ITContext context,
List<IExpression> params);

public abstract IExpression callAllRelation(ITContext context,
IExpression param);
IExpression param) throws ErrorAlloy, ErrorUnsupported;

}
5 changes: 2 additions & 3 deletions plugins/pt.uminho.haslab.echo/src/pt/uminho/haslab/mde/transformation/ERelation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ public interface ERelation {
* @throws EchoError */
public ETransformation getTransformation() throws ErrorUnsupported, ErrorParser, EchoError;

/** if the relation is top level */
public boolean isTop();

/** the relation name */
public String getName();

Expand All @@ -38,5 +35,7 @@ public interface ERelation {
/** the pre-condition */
public EPredicate getPre();

/** if the relation is top level */
public boolean isTop();

}
3 changes: 2 additions & 1 deletion ...ns/pt.uminho.haslab.echo/src/pt/uminho/haslab/mde/transformation/atl/EATLModelDomain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ public EATLPredicate getCondition() {
EATLPredicate x = new EATLPredicate();
if (domain.eClass().getName().equals("InPattern")) {
EObject filter = (EObject) domain.eGet(domain.eClass().getEStructuralFeature("filter"));
x.addCondition(filter);
if (filter != null)
x.addCondition(filter);
}
// else if (domain.eClass().getName().equals("OutPattern")) {
// EStructuralFeature elems = domain.eClass().getEStructuralFeature("elements");
Expand Down

0 comments on commit 3cc0b53

Please sign in to comment.