Commit 0d82f2aa authored by Johannes Eder's avatar Johannes Eder
Browse files

undo changes of last commit

parent ce42be98
......@@ -27,8 +27,6 @@ import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import javax.activation.UnsupportedDataTypeException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
......@@ -47,7 +45,6 @@ import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.fortiss.af3.component.model.Component;
import org.fortiss.af3.component.model.ComponentArchitecture;
import org.fortiss.af3.component.model.OutputPort;
import org.fortiss.af3.component.utils.ComponentUtils;
import org.fortiss.af3.deployment.model.ComponentAllocation;
import org.fortiss.af3.deployment.ui.editor.INamedColumnLabelProvider;
......@@ -65,7 +62,6 @@ import org.fortiss.af3.exploration.ui.perspective.process.IProcessManager.EProce
import org.fortiss.af3.exploration.ui.util.ComponentContentProvider;
import org.fortiss.af3.platform.model.ExecutionUnit;
import org.fortiss.af3.platform.model.PlatformArchitecture;
import org.fortiss.tooling.base.model.element.IConnection;
import org.fortiss.tooling.base.model.element.IModelElement;
import org.fortiss.tooling.base.model.visualization.DataSetCollection;
import org.fortiss.tooling.kernel.service.IPersistencyService;
......@@ -233,39 +229,39 @@ public class DeploymentSynthesisViewBackend extends DeploymentSynthesisViewGUI {
Z3ModelElementFactory.createSMTConstraint("Basic Deployment Constraint",
deploymentConstraint, true);
basicDeploymentConstraint.setUnfoldQuantifier(false);
// subSet.getExplorationTargets().add(basicDeploymentConstraint);
List<IConnection> channels = new ArrayList<>();
for(IModelElement c : components) {
Component com = (Component)c;
for(OutputPort o : com.getOutputPorts()) {
channels.addAll(o.getOutgoingChannels());
}
}
try {
List<IExpression> createBasicSignalConstraint =
DeploymentRun2.createBasicSignalConstraint(channels, platform);
int i = 0;
for(IExpression e : createBasicSignalConstraint) {
if(i == 0) {
++i;
continue;
}
SMTConstraint constraint =
Z3ModelElementFactory.createSMTConstraint(
"Basic Deployment Constraint" + i, e, true);
// TODO: remove
if(i < 3) {
constraint.setUnfoldQuantifier(false);
} else {
constraint.setUnfoldQuantifier(true);
}
subSet.getExplorationTargets().add(constraint);
++i;
}
} catch(UnsupportedDataTypeException e) {
e.printStackTrace();
}
subSet.getExplorationTargets().add(basicDeploymentConstraint);
// List<IConnection> channels = new ArrayList<>();
// for(IModelElement c : components) {
// Component com = (Component)c;
// for(OutputPort o : com.getOutputPorts()) {
// channels.addAll(o.getOutgoingChannels());
// }
// }
// try {
// List<IExpression> createBasicSignalConstraint =
// DeploymentRun2.createBasicSignalConstraint(channels, platform);
// int i = 0;
// for(IExpression e : createBasicSignalConstraint) {
// if(i == 0) {
// ++i;
// continue;
// }
// SMTConstraint constraint =
// Z3ModelElementFactory.createSMTConstraint(
// "Basic Deployment Constraint" + i, e, true);
// // TODO: remove
// if(i < 3) {
// constraint.setUnfoldQuantifier(false);
// } else {
// constraint.setUnfoldQuantifier(true);
// }
// subSet.getExplorationTargets().add(constraint);
// ++i;
// }
// } catch(UnsupportedDataTypeException e) {
// e.printStackTrace();
// }
// PlatformArchitecture platformArchitecture =
// IDSEPerspectiveManager.INSTANCE.getPArchitectureInScope();
......@@ -273,7 +269,6 @@ public class DeploymentSynthesisViewBackend extends DeploymentSynthesisViewGUI {
// IDSEPerspectiveManager.INSTANCE.getCArchitectureInScope();
// EList<? extends IModelElement> channels =
// EcoreUtils.getChildrenWithType(componentArchitecture, Channel.class);
// IExpression deploymentSignalConstraint =
// DeploymentRun.createBasicDeploymentSignalConstraint((List<IModelElement>)channels,
// platformArchitecture);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment