4 files changed, 2 insertions, 63 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext
index be1ac662..537989f7 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext
@@ -2,7 +2,6 @@ grammar hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration with org
 

 import "http://www.eclipse.org/emf/2002/Ecore" as ecore

 import "http://www.eclipse.org/viatra/query/patternlanguage/emf/PatternLanguage" as viatra

-import "http://www.bme.hu/mit/inf/dslreasoner/faulttree/components/CftLanguage" as cftLanguage

 generate applicationConfiguration "http://www.bme.hu/mit/inf/dslreasoner/application/ApplicationConfiguration"

 

 ConfigurationScript:

@@ -25,16 +24,13 @@ INTLiteral returns ecore::EInt:
 // Imports

 ///////////////////////////////////////////////////

 Import:

-        EPackageImport | ViatraImport | CftImport;

+        EPackageImport | ViatraImport;

 

 EPackageImport:

         "import" "epackage" importedPackage=[ecore::EPackage|STRING];

 

 ViatraImport:

         "import" "viatra" importedViatra=[viatra::PatternModel|STRING];

-

-CftImport:

-        "import" "reliability" importedCft=[cftLanguage::CftModel|STRING];

         

 ///////////////////////////////////////////////////

 // Declaration

@@ -160,7 +156,7 @@ ThresholdEntry:
         function=ObjectiveFunction operator=ComparisonOperator threshold=REALLiteral;

 

 ObjectiveFunction:

-        CostObjectiveFunction | ReliabilityObjectiveFunction;

+        CostObjectiveFunction;

 

 CostObjectiveFunction:

         'cost' '{' entries+=CostEntry (',' entries+=CostEntry)* '}';

@@ -168,17 +164,6 @@ CostObjectiveFunction:
 CostEntry:

         patternElement=PatternElement '=' weight=INTLiteral;

 

-ReliabilityObjectiveFunction:

-        ReliabiltiyProbability | Mtff;

-

-ReliabiltiyProbability:

-        'reliability' (package=[cftLanguage::CftModel|QualifiedName] '::')?

-        transformation=[cftLanguage::TransformationDefinition]

-        'at' time=REALLiteral;

-

-Mtff:

-        'mtff' (package=[cftLanguage::CftModel|QualifiedName] '::')? transformation=[cftLanguage::TransformationDefinition];

-

 ObjectiveDeclaration:

         'objectives' name=ID specification=ObjectiveSpecification;

 

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/GenerateApplicationConfiguration.mwe2 b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/GenerateApplicationConfiguration.mwe2
index 3983cd10..13cc78a8 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/GenerateApplicationConfiguration.mwe2
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/GenerateApplicationConfiguration.mwe2
@@ -31,7 +31,6 @@ Workflow {
                         name = "hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration"

                         referencedResource = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel"

                         referencedResource = "platform:/resource/org.eclipse.viatra.query.patternlanguage.emf/model/PatternLanguage.genmodel"

-                        referencedResource = "platform:/resource/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.genmodel"

                         fileExtensions = "vsconfig"

                         serializer = {

                                 generateStub = false

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/linking/ApplicationConfigurationLinkingService.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/linking/ApplicationConfigurationLinkingService.xtend
index ec79ac89..fafba1d7 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/linking/ApplicationConfigurationLinkingService.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/linking/ApplicationConfigurationLinkingService.xtend
@@ -2,13 +2,9 @@ package hu.bme.mit.inf.dslreasoner.application.linking
 

 import com.google.inject.Inject

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ApplicationConfigurationPackage

-import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.CftImport

-import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigurationScript

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.EPackageImport

-import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.PatternEntry

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ViatraImport

 import java.util.Collections

-import java.util.List

 import java.util.Optional

 import org.eclipse.emf.common.util.URI

 import org.eclipse.emf.ecore.EObject

@@ -17,7 +13,6 @@ import org.eclipse.emf.ecore.EReference
 import org.eclipse.emf.ecore.resource.Resource

 import org.eclipse.emf.ecore.resource.ResourceSet

 import org.eclipse.viatra.query.patternlanguage.emf.scoping.IMetamodelProvider

-import org.eclipse.xtext.EcoreUtil2

 import org.eclipse.xtext.conversion.IValueConverterService

 import org.eclipse.xtext.conversion.ValueConverterException

 import org.eclipse.xtext.linking.impl.DefaultLinkingService

@@ -39,10 +34,6 @@ class ApplicationConfigurationLinkingService extends DefaultLinkingService {
                         if (ref == viatraImport_ImportedViatra) {

                                 return getViatra(context, node)

                         }

-                } else if (context instanceof CftImport) {

-                        if (ref == cftImport_ImportedCft) {

-                                return getCftModel(context, node)

-                        }

                 }

                 return super.getLinkedObjects(context, ref, node)

         }

@@ -113,8 +104,4 @@ class ApplicationConfigurationLinkingService extends DefaultLinkingService {
                         Optional.empty

                 }

         }

-        

-        private def getCftModel(CftImport context, INode node) {

-                getByUri(context, cftImport_ImportedCft, node)

-        }

 }

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping/ApplicationConfigurationScopeProvider.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping/ApplicationConfigurationScopeProvider.xtend
index 4daf9831..e5db9893 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping/ApplicationConfigurationScopeProvider.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping/ApplicationConfigurationScopeProvider.xtend
@@ -4,15 +4,12 @@
 package hu.bme.mit.inf.dslreasoner.application.scoping

 

 import com.google.inject.Inject

-import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.CftImport

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigurationScript

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.EPackageImport

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.MetamodelElement

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.MetamodelEntry

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.PatternEntry

-import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ReliabilityObjectiveFunction

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ViatraImport

-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftModel

 import org.eclipse.emf.ecore.EClass

 import org.eclipse.emf.ecore.EEnum

 import org.eclipse.emf.ecore.EObject

@@ -47,10 +44,6 @@ class ApplicationConfigurationScopeProvider extends AbstractApplicationConfigura
                                 getViatraPackageScope(context, reference, document)

                         case PATTERN_ELEMENT__PATTERN:

                                 getViatraPatternScope(context, document)

-                        case RELIABILITY_OBJECTIVE_FUNCTION__PACKAGE:

-                                getCftPackageScope(context, reference, document)

-                        case RELIABILITY_OBJECTIVE_FUNCTION__TRANSFORMATION:

-                                getCftTransformationScope(context, document)

                         default:

                                 super.getScope(context, reference)

                 }

@@ -72,14 +65,6 @@ class ApplicationConfigurationScopeProvider extends AbstractApplicationConfigura
                 document.allViatraPackages.map[patterns].flatten

         }

 

-        private def getAllCftPackages(ConfigurationScript document) {

-                document.imports.filter(CftImport).map[importedCft].filterNull

-        }

-

-        private def getAllCftTransformations(ConfigurationScript document) {

-                document.allCftPackages.map[transformationDefinitions].flatten

-        }

-

         private def getEPackageScope(ConfigurationScript document) {

                 Scopes.scopeFor(document.allEPackages)

         }

@@ -126,23 +111,6 @@ class ApplicationConfigurationScopeProvider extends AbstractApplicationConfigura
                 }

                 Scopes.scopeFor(patterns)

         }

-

-        private def getCftPackageScope(EObject context, EReference reference, ConfigurationScript document) {

-                val cftModelNameConverter = [ CftModel cftModel |

-                        toQualifiedNameOrNull(cftModel.packageName)

-                ]

-                Scopes.scopeFor(document.allCftPackages, cftModelNameConverter, super.getScope(context, reference))

-        }

-

-        private def getCftTransformationScope(EObject context, ConfigurationScript document) {

-                val transformations = switch (context) {

-                        ReliabilityObjectiveFunction case context.package !== null:

-                                context.package.transformationDefinitions

-                        default:

-                                document.allCftTransformations

-                }

-                Scopes.scopeFor(transformations)

-        }

         

         private def toQualifiedNameOrNull(String packageName) {

                 if (packageName === null) {