Commit 9c89aeb8 authored by Alexander Diewald's avatar Alexander Diewald
Browse files

DSE-SolConv: Remove separate output artifact property

We export all inputs to the conversion service anyways due to the
snapshot nature of the DSE project.

Issue-Ref: 3791
Issue-Url: https://af3-developer.fortiss.org/issues/3791

Signed-off-by: Alexander Diewald's avatarAlexander Diewald <diewald@fortiss.org>
parent 90b4fd51
DSESolutionArtifacts.java c67ed279c5754526b390fba563af1965bf21835a RED
DSESolutionArtifacts.java 786585611e8c76f93bb8a7be1fa8e6f4cebd321b YELLOW
DSESolutionConversionContext.java d16e052e6c3b56b7e2ae21ffec97bd41df1d3d4d YELLOW
DSESolutionConverterBase.java ddfd79b2535b7242b39c331ba8a12ccc36155677 YELLOW
IDSESolutionConverter.java 4c3f3555b98c19d0642797a28de1d9bdd113ab5a YELLOW
InputAllocationTableConverter.java 673edbfa6fb651f59d34dcf12508397ec4cb554c GREEN
RouteConverter.java b63f6c096b3c33595ff3d6225e294b894208b07e YELLOW
ScheduleConverter.java d9d5d86b56fc7dd5fa518c9d8a5ef477bac6b90a RED
SignalToRouteConverter.java 1ff7b1028d62be16b1778b1f207cf91698f461a5 RED
......
......@@ -26,7 +26,6 @@ import java.util.function.Function;
import org.fortiss.af3.exploration.dseml.model.expression.SuperSet;
import org.fortiss.af3.exploration.model.SuperSetMap;
import org.fortiss.af3.project.model.FileProject;
import org.fortiss.tooling.base.model.element.IModelElement;
import org.fortiss.tooling.kernel.model.IProjectRootElement;
......@@ -42,9 +41,6 @@ public class DSESolutionArtifacts {
/** Holder for all input and transformed artifacts. */
private Map<Class<? extends IProjectRootElement>, IProjectRootElement> inOutArtifacts;
/** Holder for artifacts that shall be exported to the AF3 {@link FileProject}. */
private Map<Class<? extends IProjectRootElement>, IProjectRootElement> outputArtifacts;
/** Constructor. */
@SuppressWarnings("unchecked")
public DSESolutionArtifacts(SuperSetMap solutionMapCopy,
......@@ -53,12 +49,6 @@ public class DSESolutionArtifacts {
this.inOutArtifacts = inputModelCopies.stream()
.collect(toMap(i -> (Class<? extends IProjectRootElement>)getInterfaceType(i),
Function.identity()));
// Snapshot nature: We must include all relevant input models in the set of outputs.
// TODO(AD): Code duplicate from above.
this.outputArtifacts = inputModelCopies.stream()
.collect(toMap(i -> (Class<? extends IProjectRootElement>)getInterfaceType(i),
Function.identity()));
}
/**
......@@ -104,8 +94,6 @@ public class DSESolutionArtifacts {
public void addTransformedRootElement(IProjectRootElement rootElement) {
inOutArtifacts.put((Class<? extends IProjectRootElement>)getInterfaceType(rootElement),
rootElement);
outputArtifacts.put((Class<? extends IProjectRootElement>)getInterfaceType(rootElement),
rootElement);
}
/**
......@@ -114,7 +102,7 @@ public class DSESolutionArtifacts {
*/
public Collection<Entry<Class<? extends IProjectRootElement>, IProjectRootElement>>
getOutputs() {
return outputArtifacts.entrySet();
return inOutArtifacts.entrySet();
}
/**
......
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