Skip to content

Commit

Permalink
renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
pparizek committed Jul 2, 2013
1 parent 444896e commit a8a9dec
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion jdeeco-demo/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
<arg value="+site=site.properties"/>
<arg value="+jpf-core.native_classpath+=;${dist}/jdeeco.jar;${dist}/jdeeco-jpf.jar"/>
<arg value="${demo}/../jpfProperties/LocalLauncherConvoyLTL.jpf"/>
<jvmarg value="-Xmx2g"/>
<jvmarg value="-Xmx8g"/>
</java>
</target>

Expand Down
2 changes: 1 addition & 1 deletion jdeeco-demo/jpfProperties/LocalLauncherConvoyLTL.jpf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ vm.storage.class=gov.nasa.jpf.jvm.FullStateSet

target=cz.cuni.mff.d3s.deeco.demo.convoytut.LocalLauncherLTL

deeco.ltl=[](isFollowerNearLeader-><>isFollowerAtDestination)
ltl.input=[](isFollowerNearLeader-><>isFollowerAtDestination)

report.console.property_violation=error,trace

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import cz.cuni.mff.d3s.deeco.logging.Log;
import cz.cuni.mff.d3s.deeco.ltl.AtomicProposition;

import cz.cuni.mff.d3s.deeco.ltl.CommlinkDEECoJPF;
import cz.cuni.mff.d3s.ltl.CommlinkSuTJPF;



Expand Down Expand Up @@ -126,13 +126,13 @@ private void tryEvaluatePropositions() {

// send names of atomic propositions into JPF
// we consider only propositions that evaluate to "true" in the current state
CommlinkDEECoJPF.notifyEventProcessingStart();
CommlinkSuTJPF.notifyEventProcessingStart();
for (AtomicProposition ap : propositions)
{
Boolean apVal = propositionValues.get(ap.getName());
if ((apVal != null) && apVal.booleanValue()) CommlinkDEECoJPF.addTrueAtomicProposition(ap.getName());
if ((apVal != null) && apVal.booleanValue()) CommlinkSuTJPF.addTrueAtomicProposition(ap.getName());
}
CommlinkDEECoJPF.notifyAtomicPropositionsComplete();
CommlinkSuTJPF.notifyAtomicPropositionsComplete();
}
}
}

0 comments on commit a8a9dec

Please sign in to comment.