Adapt to current core API

Author: 6b6279

src/main/java/edu/kit/travart/dopler/plugin/DoplerBenchmarkingPlugin.java

@@ -50,10 +50,12 @@ public DoplerBenchmarkingPlugin() {
         injector = new Injector();
     }
 
+    /*
     @Override
     public IModelTransformer<Dopler> getTransformer() {
         return injector.getInstance(Transformer.class);
     }
+    */
 
     @Override
 	public AbstractBenchmarkingTransformer<Dopler> getBenchmarkingTransformer() {

src/main/java/edu/kit/travart/dopler/transformation/DoplerBenchmarkingTransformer.java

@@ -6,6 +6,7 @@
 import edu.kit.dopler.model.Dopler;
 import edu.kit.travart.dopler.transformation.decision.to.feature.DmToFmTransformer;
 import edu.kit.travart.dopler.transformation.feature.to.decision.FmToDmTransformer;
+import edu.kit.travart.dopler.transformation.util.DoplerStatistics;
 import at.jku.cps.travart.core.transformation.*;
 
 public class DoplerBenchmarkingTransformer extends AbstractBenchmarkingTransformer<Dopler> {
@@ -38,6 +39,6 @@ public FeatureModel transformInner(Dopler model, String modelName, STRATEGY stra
 
 	@Override
 	public IStatistics<Dopler> getTargetStatistics() {
-		throw new UnsupportedOperationException("Not implemented");
+		return DoplerStatistics.getInstance();
 	}
 }

src/main/java/edu/kit/travart/dopler/transformation/Transformer.java

@@ -42,12 +42,12 @@ public Transformer(DmToFmTransformer dmToFmTransformer, FmToDmTransformer fmToDm
     }
 
     @Override
-    public FeatureModel transform(Dopler model, String s, STRATEGY strategy) {
+    public FeatureModel transform(Dopler model, String s, STRATEGY strategy, boolean intermediate) {
         return dmToFmTransformer.transform(model, strategy);
     }
 
     @Override
-    public Dopler transform(FeatureModel featureModel, String s, STRATEGY strategy) {
+    public Dopler transform(FeatureModel featureModel, String s, STRATEGY strategy, boolean intermediate) {
         return fmToDmTransformer.transform(featureModel, strategy);
     }
 }

src/test/java/edu/kit/travart/dopler/transformation/DecisionToFeatureModelTest.java

@@ -70,14 +70,14 @@ protected FeatureModel getToModelFromString(String model) {
     @Override
     protected FeatureModel transformFromModelToToModel(Dopler modelToBeTransformed, IModelTransformer.STRATEGY strategy)
             throws NotSupportedVariabilityTypeException {
-        return plugin.getTransformer().transform(modelToBeTransformed, TreeBeautifier.STANDARD_MODEL_NAME, strategy);
+        return plugin.getTransformer().transform(modelToBeTransformed, TreeBeautifier.STANDARD_MODEL_NAME, strategy, false);
     }
 
     @Override
     protected Dopler transformToModelToFromModel(FeatureModel modelToBeTransformed)
             throws NotSupportedVariabilityTypeException {
         return plugin.getTransformer().transform(modelToBeTransformed, TreeBeautifier.STANDARD_MODEL_NAME,
-                IModelTransformer.STRATEGY.ONE_WAY);
+                IModelTransformer.STRATEGY.ONE_WAY, false);
     }
 
     @Override

src/test/java/edu/kit/travart/dopler/transformation/FeatureToDecisionModelTest.java

@@ -88,13 +88,13 @@ protected Dopler getToModelFromString(String model) throws Exception {
     @Override
     protected Dopler transformFromModelToToModel(FeatureModel modelToBeTransformed, IModelTransformer.STRATEGY strategy)
             throws NotSupportedVariabilityTypeException {
-        return plugin.getTransformer().transform(modelToBeTransformed, TreeBeautifier.STANDARD_MODEL_NAME, strategy);
+        return plugin.getTransformer().transform(modelToBeTransformed, TreeBeautifier.STANDARD_MODEL_NAME, strategy, false);
     }
 
     @Override
     protected FeatureModel transformToModelToFromModel(Dopler modelToBeTransformed)
             throws NotSupportedVariabilityTypeException {
         return plugin.getTransformer().transform(modelToBeTransformed, TreeBeautifier.STANDARD_MODEL_NAME,
-                IModelTransformer.STRATEGY.ONE_WAY);
+                IModelTransformer.STRATEGY.ONE_WAY, false);
     }
 }

src/test/java/edu/kit/travart/dopler/transformation/TransformationStressTest.java

@@ -57,12 +57,12 @@ class TransformationStressTest {
     @Execution(ExecutionMode.CONCURRENT)
     void tryToConvert(Path path) throws Exception {
         FeatureModel featureModel = new UVLModelFactory().parse(Files.readString(path));
-        Dopler dopler1 = transformer.transform(featureModel, "", ONE_WAY);
-        Dopler dopler2 = transformer.transform(featureModel, "", ROUNDTRIP);
+        Dopler dopler1 = transformer.transform(featureModel, "", ONE_WAY, false);
+        Dopler dopler2 = transformer.transform(featureModel, "", ROUNDTRIP, false);
         Dopler cleanDopler1 = new DecisionModelReader().read(new DecisionModelWriter().write(dopler1), "");
         Dopler cleanDopler2 = new DecisionModelReader().read(new DecisionModelWriter().write(dopler2), "");
-        transformer.transform(cleanDopler1, "", ONE_WAY);
-        transformer.transform(cleanDopler2, "", ROUNDTRIP);
+        transformer.transform(cleanDopler1, "", ONE_WAY, false);
+        transformer.transform(cleanDopler2, "", ROUNDTRIP, false);
     }
 
     private static Stream<Arguments> dataSourceMethod() throws IOException {