diff options
Diffstat (limited to 'Tests')
10 files changed, 18 insertions, 155 deletions
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin b/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin deleted file mode 100644 index 4a93782b..00000000 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin +++ /dev/null | |||
Binary files differ | |||
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTreeSMTQual.vsconfig b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTreeSMTQual.vsconfig index 80ab2906..fa9cd6e2 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTreeSMTQual.vsconfig +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTreeSMTQual.vsconfig | |||
@@ -36,6 +36,9 @@ generate { | |||
36 | log-level = normal, | 36 | log-level = normal, |
37 | "fitness-punishSize" = "false", | 37 | "fitness-punishSize" = "false", |
38 | "fitness-scope" = "3", | 38 | "fitness-scope" = "3", |
39 | "fitness-objectCreationCosts" = "true", | ||
40 | "scopePropagator" = "typeHierarchy", | ||
41 | "fitness-missing-containment" = "2", | ||
39 | "numeric-solver-at-end" = "true" | 42 | "numeric-solver-at-end" = "true" |
40 | } | 43 | } |
41 | 44 | ||
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/queries/SatelliteQueries.vql b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/queries/SatelliteQueries.vql index 57b5933a..da889032 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/queries/SatelliteQueries.vql +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/queries/SatelliteQueries.vql | |||
@@ -245,146 +245,4 @@ pattern tooLowPathLengthForGroundStation(s:CommSubsystem) { | |||
245 | GroundStationNetwork.commSubsystem(_,ts); | 245 | GroundStationNetwork.commSubsystem(_,ts); |
246 | check(l!=385000);//385.000km | 246 | check(l!=385000);//385.000km |
247 | } | 247 | } |
248 | //// | 248 | |
249 | //// Metrics | ||
250 | //// | ||
251 | // | ||
252 | //// Coverage | ||
253 | // | ||
254 | //pattern coverageMetric(Coverage : java Double) { | ||
255 | // Coverage == sum find missionCoverage(_, #_); | ||
256 | //} | ||
257 | // | ||
258 | //private pattern missionCoverage(Mission : InterferometryMission, Coverage : java Double) { | ||
259 | // InterferometryMission.observationTime(Mission, ObservationTime); | ||
260 | // ObserverCount == count find spacecraftWithInterferometryPayload(Mission, _); | ||
261 | // Coverage == eval(Math.pow(1 - 2.0 / ObserverCount, 1 + 9 * (1.0 / ObservationTime)) + 0.05 * ObservationTime / 3); | ||
262 | //} | ||
263 | // | ||
264 | //// Time | ||
265 | // | ||
266 | //pattern timeMetric(Time : java Double) { | ||
267 | // Time == sum find missionTime(_, #_); | ||
268 | //} | ||
269 | // | ||
270 | //private pattern missionTime(Mission : InterferometryMission, Time : java Double) { | ||
271 | // InterferometryMission.observationTime(Mission, ObservationTime); | ||
272 | // TrasmitTime == sum find transmitTime(Mission, _, #_); | ||
273 | // Time == eval(TrasmitTime + 60.0 * ObservationTime); | ||
274 | //} | ||
275 | // | ||
276 | //private pattern transmitTime(Mission : InterferometryMission, Spacecraft : Spacecraft, TransmitTime : java Double) { | ||
277 | // ConstellationMission.spacecraft(Mission, Spacecraft); | ||
278 | // find scienceData(Spacecraft, ScienceData); | ||
279 | // IncomingData == sum find incomingData(Spacecraft, _, #_); | ||
280 | // find transmitRate(Spacecraft, TransmitRate); | ||
281 | // TransmitTime == eval((ScienceData + IncomingData) / (7.5 * TransmitRate)); | ||
282 | //} | ||
283 | // | ||
284 | //private pattern incomingData(Spacecraft : Spacecraft, Source : Spacecraft, Data : java Double) { | ||
285 | // find indirectCommunicationLink(Source, Spacecraft); | ||
286 | // find scienceData(Source, Data); | ||
287 | //} | ||
288 | // | ||
289 | //private pattern scienceData(Spacecraft : Spacecraft, Data : java Double) { | ||
290 | // ConstellationMission.spacecraft(Mission, Spacecraft); | ||
291 | // InterferometryMission.observationTime(Mission, ObservationTime); | ||
292 | // Data == eval(12.0 * ObservationTime); | ||
293 | //} | ||
294 | // | ||
295 | //private pattern transmitRate(Spacecraft : Spacecraft, TransmitRate : java Double) { | ||
296 | // find spacecraftUplink(Spacecraft, Comm, Target); | ||
297 | // UHFCommSubsystem(Comm); | ||
298 | // Spacecraft(Target); | ||
299 | // TransmitRate == 5.0; | ||
300 | //} or { | ||
301 | // find spacecraftUplink(Spacecraft, Comm, Target); | ||
302 | // XCommSubsystem(Comm); | ||
303 | // Spacecraft(Target); | ||
304 | // TransmitRate == 1.6; | ||
305 | //} or { | ||
306 | // find spacecraftUplink(Spacecraft, Comm, Target); | ||
307 | // XCommSubsystem(Comm); | ||
308 | // GroundStationNetwork(Target); | ||
309 | // TransmitRate == 0.7; | ||
310 | //} or { | ||
311 | // find spacecraftUplink(Spacecraft, Comm, Target); | ||
312 | // KaCommSubsystem(Comm); | ||
313 | // Spacecraft(Target); | ||
314 | // TransmitRate == 220.0; | ||
315 | //} or { | ||
316 | // find spacecraftUplink(Spacecraft, Comm, Target); | ||
317 | // KaCommSubsystem(Comm); | ||
318 | // GroundStationNetwork(Target); | ||
319 | // TransmitRate == 80.0; | ||
320 | //} | ||
321 | // | ||
322 | //private pattern spacecraftUplink(Spacecraft : Spacecraft, TargetSubsystem : CommSubsystem, Target : CommunicatingElement) { | ||
323 | // CommunicatingElement.commSubsystem.target(Spacecraft, TargetSubsystem); | ||
324 | // CommunicatingElement.commSubsystem(Target, TargetSubsystem); | ||
325 | //} | ||
326 | // | ||
327 | //// Cost | ||
328 | // | ||
329 | //pattern costMetric(Cost : java Double) { | ||
330 | // Cost == sum find missionCost(_, #_); | ||
331 | //} | ||
332 | // | ||
333 | //private pattern missionCost(Mission : InterferometryMission, Cost : java Double) { | ||
334 | // InterferometryMission.observationTime(Mission, ObservationTime); | ||
335 | // SpacecraftCost == sum find spacecraftCost(Mission, _, #_); | ||
336 | // Cost == eval(SpacecraftCost + 100000.0 * ObservationTime); | ||
337 | //} | ||
338 | // | ||
339 | //private pattern spacecraftCost(Mission : InterferometryMission, Spacecraft : Spacecraft, Cost : java Double) { | ||
340 | // ConstellationMission.spacecraft(Mission, Spacecraft); | ||
341 | // find spacecraftOfKindCount(Spacecraft, KindCount); | ||
342 | // find basePrice(Spacecraft, BasePrice); | ||
343 | // find interferometryPayloadCost(Spacecraft, InterferometryPayloadCost); | ||
344 | // find additionalCommSubsystemCost(Spacecraft, AdditionalCommSubsystemCost); | ||
345 | // Cost == eval(BasePrice * Math.pow(KindCount, -0.25) + InterferometryPayloadCost + AdditionalCommSubsystemCost); | ||
346 | //} | ||
347 | // | ||
348 | //private pattern spacecraftOfKindCount(Sat : Spacecraft, Count : java Integer) { | ||
349 | // CubeSat3U(Sat); | ||
350 | // Count == count find cubeSat3U(_); | ||
351 | //} or { | ||
352 | // CubeSat6U(Sat); | ||
353 | // Count == count find cubeSat6U(_); | ||
354 | //} or { | ||
355 | // SmallSat(Sat); | ||
356 | // Count == count find smallSat(_); | ||
357 | //} | ||
358 | // | ||
359 | //private pattern basePrice(Spacecraft : Spacecraft, BasePrice : java Double) { | ||
360 | // CubeSat3U(Spacecraft); | ||
361 | // BasePrice == 250000.0; | ||
362 | //} or { | ||
363 | // CubeSat6U(Spacecraft); | ||
364 | // BasePrice == 750000.0; | ||
365 | //} or { | ||
366 | // SmallSat(Spacecraft); | ||
367 | // BasePrice == 3000000.0; | ||
368 | //} | ||
369 | // | ||
370 | //private pattern interferometryPayloadCost(Spacecraft : Spacecraft, Cost : java Double) { | ||
371 | // find spacecraftWithInterferometryPayload(_, Spacecraft); | ||
372 | // Cost == 50000.0; | ||
373 | //} or { | ||
374 | // neg find spacecraftWithInterferometryPayload(_, Spacecraft); | ||
375 | // Cost == 0.0; | ||
376 | //} | ||
377 | // | ||
378 | //private pattern additionalCommSubsystemCost(Spacecraft : Spacecraft, Cost : java Double) { | ||
379 | // find spacecraftWithTwoCommSubsystems(Spacecraft); | ||
380 | // Cost == 100000.0; | ||
381 | //} or { | ||
382 | // neg find spacecraftWithTwoCommSubsystems(Spacecraft); | ||
383 | // Cost == 0.0; | ||
384 | //} | ||
385 | // | ||
386 | //private pattern spacecraftWithTwoCommSubsystems(Spacecraft : Spacecraft) { | ||
387 | // Spacecraft.commSubsystem(Spacecraft, Subsystem1); | ||
388 | // Spacecraft.commSubsystem(Spacecraft, Subsystem2); | ||
389 | // Subsystem1 != Subsystem2; | ||
390 | //} | ||
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemHint.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemHint.xtend index 8d6523b1..300f8b51 100644 --- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemHint.xtend +++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemHint.xtend | |||
@@ -4,6 +4,8 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic | |||
4 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace | 4 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace |
5 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeExpressionBuilderFactory | 5 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeExpressionBuilderFactory |
6 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGenerator | 6 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGenerator |
7 | import java.util.Map | ||
8 | import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery | ||
7 | 9 | ||
8 | class FileSystemHint extends Ecore2LogicTraceBasedHint { | 10 | class FileSystemHint extends Ecore2LogicTraceBasedHint { |
9 | static val REMAINING_CONTENTS_ROOT = "hint_root" | 11 | static val REMAINING_CONTENTS_ROOT = "hint_root" |
@@ -12,7 +14,7 @@ class FileSystemHint extends Ecore2LogicTraceBasedHint { | |||
12 | super(ecore2Logic, trace) | 14 | super(ecore2Logic, trace) |
13 | } | 15 | } |
14 | 16 | ||
15 | override getAdditionalPatterns(PatternGenerator it) ''' | 17 | override getAdditionalPatterns(PatternGenerator it, Map<String, PQuery> fqnToPQuery) ''' |
16 | pattern «REMAINING_CONTENTS_ROOT»(problem:LogicProblem, interpretation:PartialInterpretation, remainingContents:java Integer) { | 18 | pattern «REMAINING_CONTENTS_ROOT»(problem:LogicProblem, interpretation:PartialInterpretation, remainingContents:java Integer) { |
17 | find interpretation(problem, interpretation); | 19 | find interpretation(problem, interpretation); |
18 | remainingContents == sum find remainingContents_root_reference_Dir_helper(problem, interpretation, _, #_) | 20 | remainingContents == sum find remainingContents_root_reference_Dir_helper(problem, interpretation, _, #_) |
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend index f4f36951..9cc6e415 100644 --- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend +++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend | |||
@@ -1,10 +1,10 @@ | |||
1 | package hu.bme.mit.inf.dslreasoner.run | 1 | package hu.bme.mit.inf.dslreasoner.run |
2 | 2 | ||
3 | import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher | ||
4 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation | 3 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation |
4 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethod | ||
5 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethodBasedGlobalConstraint | 5 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethodBasedGlobalConstraint |
6 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethod | ||
7 | import org.eclipse.viatra.dse.base.ThreadContext | 6 | import org.eclipse.viatra.dse.base.ThreadContext |
7 | import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher | ||
8 | 8 | ||
9 | class FileSystemInconsistencyDetector extends ModelGenerationMethodBasedGlobalConstraint { | 9 | class FileSystemInconsistencyDetector extends ModelGenerationMethodBasedGlobalConstraint { |
10 | var PartialInterpretation partialInterpretation | 10 | var PartialInterpretation partialInterpretation |
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend index bf9ca274..cbc692b3 100644 --- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend +++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend | |||
@@ -12,8 +12,8 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace | |||
12 | import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor | 12 | import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor |
13 | import hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.Patterns | 13 | import hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.Patterns |
14 | import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor | 14 | import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor |
15 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethod | ||
16 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeConstraintHint | 15 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeConstraintHint |
16 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethod | ||
17 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethodBasedGlobalConstraint | 17 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethodBasedGlobalConstraint |
18 | import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace | 18 | import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace |
19 | import java.util.Collection | 19 | import java.util.Collection |
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphHint.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphHint.xtend index 97ce4ee6..9a84f777 100644 --- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphHint.xtend +++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphHint.xtend | |||
@@ -4,13 +4,15 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic | |||
4 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace | 4 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace |
5 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeExpressionBuilderFactory | 5 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeExpressionBuilderFactory |
6 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGenerator | 6 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGenerator |
7 | import java.util.Map | ||
8 | import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery | ||
7 | 9 | ||
8 | class SGraphHint extends Ecore2LogicTraceBasedHint { | 10 | class SGraphHint extends Ecore2LogicTraceBasedHint { |
9 | new(Ecore2Logic ecore2Logic, Ecore2Logic_Trace trace) { | 11 | new(Ecore2Logic ecore2Logic, Ecore2Logic_Trace trace) { |
10 | super(ecore2Logic, trace) | 12 | super(ecore2Logic, trace) |
11 | } | 13 | } |
12 | 14 | ||
13 | override getAdditionalPatterns(extension PatternGenerator patternGenerator) { | 15 | override getAdditionalPatterns(extension PatternGenerator patternGenerator, Map<String, PQuery> fqnToPQuery) { |
14 | "" | 16 | "" |
15 | } | 17 | } |
16 | 18 | ||
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphInconsistencyDetector.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphInconsistencyDetector.xtend index 22addd3d..b8167566 100644 --- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphInconsistencyDetector.xtend +++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphInconsistencyDetector.xtend | |||
@@ -1,7 +1,7 @@ | |||
1 | package hu.bme.mit.inf.dslreasoner.run | 1 | package hu.bme.mit.inf.dslreasoner.run |
2 | 2 | ||
3 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethod | ||
4 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation | 3 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation |
4 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethod | ||
5 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethodBasedGlobalConstraint | 5 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethodBasedGlobalConstraint |
6 | import org.eclipse.viatra.dse.base.ThreadContext | 6 | import org.eclipse.viatra.dse.base.ThreadContext |
7 | import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher | 7 | import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher |
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SatelliteHint.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SatelliteHint.xtend index ef5b779e..28954d60 100644 --- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SatelliteHint.xtend +++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SatelliteHint.xtend | |||
@@ -5,6 +5,8 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace | |||
5 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.Modality | 5 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.Modality |
6 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeExpressionBuilderFactory | 6 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeExpressionBuilderFactory |
7 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGenerator | 7 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGenerator |
8 | import java.util.Map | ||
9 | import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery | ||
8 | 10 | ||
9 | class SatelliteHint extends Ecore2LogicTraceBasedHint { | 11 | class SatelliteHint extends Ecore2LogicTraceBasedHint { |
10 | static val INTERFEROMETY_PAYLOAD = "hint_interferometryPayload" | 12 | static val INTERFEROMETY_PAYLOAD = "hint_interferometryPayload" |
@@ -14,7 +16,7 @@ class SatelliteHint extends Ecore2LogicTraceBasedHint { | |||
14 | super(ecore2Logic, trace) | 16 | super(ecore2Logic, trace) |
15 | } | 17 | } |
16 | 18 | ||
17 | override getAdditionalPatterns(PatternGenerator it) ''' | 19 | override getAdditionalPatterns(PatternGenerator it, Map<String, PQuery> fqnToPQuery) ''' |
18 | pattern «INTERFEROMETY_PAYLOAD»(problem:LogicProblem, interpretation:PartialInterpretation, object:DefinedElement) { | 20 | pattern «INTERFEROMETY_PAYLOAD»(problem:LogicProblem, interpretation:PartialInterpretation, object:DefinedElement) { |
19 | find interpretation(problem, interpretation); | 21 | find interpretation(problem, interpretation); |
20 | find mustExist(problem, interpretation, object); | 22 | find mustExist(problem, interpretation, object); |
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend index b65826ad..5e2d0920 100644 --- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend +++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend | |||
@@ -1,9 +1,8 @@ | |||
1 | package hu.bme.mit.inf.dslreasoner.run | 1 | package hu.bme.mit.inf.dslreasoner.run |
2 | 2 | ||
3 | import functionalarchitecture.FunctionalarchitecturePackage | 3 | import functionalarchitecture.FunctionalarchitecturePackage |
4 | import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Model | ||
4 | import hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns | 5 | import hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns |
5 | import hu.bme.mit.inf.dslreasoner.domains.transima.fam.Model | ||
6 | import hu.bme.mit.inf.dslreasoner.domains.transima.fam.Type | ||
7 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic | 6 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic |
8 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration | 7 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration |
9 | import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor | 8 | import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor |
@@ -15,7 +14,6 @@ import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore | |||
15 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic | 14 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic |
16 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2LogicConfiguration | 15 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2LogicConfiguration |
17 | import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor | 16 | import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor |
18 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ScopePropagatorStrategy | ||
19 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic | 17 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic |
20 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation | 18 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation |
21 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml | 19 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml |
@@ -121,8 +119,6 @@ class SimpleRun { | |||
121 | val patterns = i.specifications.toList | 119 | val patterns = i.specifications.toList |
122 | val wfPatterns = patterns.filter[it.allAnnotations.exists[it.name== "Constraint"]].toSet | 120 | val wfPatterns = patterns.filter[it.allAnnotations.exists[it.name== "Constraint"]].toSet |
123 | val derivedFeatures = new LinkedHashMap | 121 | val derivedFeatures = new LinkedHashMap |
124 | derivedFeatures.put(Type.instance,metamodel.attributes.filter[it.name == "type"].head) | ||
125 | derivedFeatures.put(Model.instance,metamodel.references.filter[it.name == "model"].head) | ||
126 | val res = new ViatraQuerySetDescriptor( | 122 | val res = new ViatraQuerySetDescriptor( |
127 | patterns, | 123 | patterns, |
128 | wfPatterns, | 124 | wfPatterns, |