Commit graph

2284 commits

Author SHA1 Message Date
Adrian Möller 82fa118dc8 More match handling refactoring 2021-10-23 21:28:04 +02:00
Adrian Möller e492ec9e41 Refactoring match handling 2021-10-22 16:23:34 +02:00
Adrian Möller 357a3cadd9 Refactoring green pattern factory provision 2021-10-22 16:19:18 +02:00
Adrian Möller f8d9e5dda2 Fix repair refactorings 2021-10-22 16:19:18 +02:00
Adrian Möller 5f098dcb75 Minor refactorings 2021-10-22 16:19:18 +02:00
Adrian Möller 2c1565d42c Refactoring repair framework 2021-10-22 16:19:17 +02:00
Adrian Möller 33f924aa88 Refactoring FilterNAC processing at integrate 2021-10-22 16:19:17 +02:00
Adrian Möller 0f9d938035 Refactoring MatchUtil & Match classification 2021-10-22 16:19:17 +02:00
Adrian Möller e60f0343f0 WIP refactoring ModelChangeProtocol & MatchUtil 2021-10-22 16:19:17 +02:00
Adrian Möller fbf5bdc899 Refactoring of integration framework 2021-10-22 16:19:17 +02:00
Adrian Möller 89039a2bfb Fix MultiplicityCounter bug which occurs if a broken match required by a multiplicity conflicted match gets revoked 2021-10-22 15:53:32 +02:00
SebastianE 3e43b93e15 Merge branch 'ThomasB/BA_ibex_debug' 2021-10-20 17:14:18 +02:00
SebastianE 922205c7b9 fixed a broken debugging artifact 2021-10-20 17:13:12 +02:00
SebastianE c072653331 Merge remote-tracking branch 'origin/master' into ThomasB/BA_ibex_debug 2021-10-20 15:42:56 +02:00
SebastianE bc10ee9234 Merge remote-tracking branch 'origin/master' into smartemf-integration
# Conflicts:
#	org.emoflon.ibex.common/src/org/emoflon/ibex/common/emf/EMFManipulationUtils.java
2021-09-28 16:46:34 +02:00
Adrian Möller 05b3d28bcd Restructured integrate fragments 2021-09-19 23:28:58 +02:00
Adrian Möller 529b49658d Removed unused imports 2021-09-19 23:22:37 +02:00
SebastianE 7f7aac0d96 Merge remote-tracking branch 'origin/gt-forEach' 2021-09-10 16:06:25 +02:00
Lars Fritsche b2378e2a08 introduced CorrespondenceNode as a new Class from which all CorrespondenceNodes inherit 2021-08-30 10:47:53 +02:00
SebastianE 79023e7e29 added explicit subtyping to iterators
-> it is now possible to traverse only edges of a specific subtype in iterations
2021-08-28 17:55:04 +02:00
SebastianE c38d717398 Merge remote-tracking branch 'origin/master' into gt-forEach 2021-08-28 15:15:45 +02:00
Thomas Brüning ebd30c60bb Delta-Persistierung Matches 2021-08-28 11:59:51 +02:00
Adrian Möller eede62c720 Fix resolve helpers 2021-08-22 12:37:10 +02:00
Adrian Möller 8f65b87878 Fix missing case differentiation between SmartEMF and non-SmartEMF resources for resolve operations 2021-08-21 12:14:06 +02:00
Lars Fritsche fbad792462 added more time logs + fixed a performance issue of the brokenmatchcontainer due to inefficient iterator() calls on HashSets -> has been fixed by using LinkedHashSets instead. 2021-08-19 23:51:32 +02:00
Lars Fritsche 3aa53e313c fixed a performance issue in BrokenMatchContainer that was caused by calling parallelStream() too often on an empty list 2021-08-18 16:35:29 +02:00
Thomas Brüning 097878fcb7 Persistierung 2021-08-18 09:14:51 +02:00
Lars Fritsche e575f87c08 replaced javabdd with a silent version without system.outs that CANNOT BE DISABLED
also removed the hacky solution to deactivate prints on the console while javabdd was running
2021-08-09 20:50:54 +02:00
Lars Fritsche 009d1b69a7 optimized csp evaluation for shortcut framework and standard propagation 2021-08-08 13:33:58 +02:00
Lars Fritsche 5c446d0f04 we now rely on SmartContentAdapter and SmartCrossReferenceAdapters that work faster with SmartEMFResources 2021-08-08 12:36:41 +02:00
Lars Fritsche ed143115a3 crossreferenceadapter is no longer created when correspondences are created with smartemf 2021-08-05 13:50:15 +02:00
Lars Fritsche c95c66d184 smartemf is now detected for the correspondence metamodel
if smartemf is detected, correspondence caching is deactivated
removed some hard coded version dependency
2021-08-04 10:20:53 +02:00
Thomas Brüning ec93acbbdf Changed getter method of modelStates 2021-07-30 13:05:30 +02:00
SebastianE 2314db69d3 Smart EMF now requires the workspace path 2021-07-29 18:33:51 +02:00
Lars Fritsche 03a3a59fcc sc rules are now persisted using the new specificationResourceSet
fixed a problem during hipe code generation where the specificationresource was null
2021-07-28 15:50:41 +02:00
Thomas Brüning 62822d4469 Refactored name to VaDoSGT 2021-07-27 18:42:30 +02:00
Lars Fritsche f229001b90 metamodel and patterns are now loaded using EMF and within their own resourceset 2021-07-26 20:53:19 +02:00
Thomas Brüning aacdf1a952 Bugfixes 2021-07-23 17:18:59 +02:00
Adrian Möller 5616e3dac7 Insert missing delete methods in EMFManipulationUtils 2021-07-14 14:04:09 +02:00
Adrian Möller 82bb8a46ea Merge remote-tracking branch 'origin/master' into smartemf-integration 2021-07-13 23:48:48 +02:00
Adrian Möller a2bd4044d9 Fix handling of rule application deletions 2021-07-13 23:48:27 +02:00
Adrian Möller eead0e801e Add description for pendingElts set in PrecedenceMatchContainer 2021-07-13 22:36:29 +02:00
Adrian Möller 40ed62619d Fixed corr cache initialization problem 2021-07-12 18:46:19 +02:00
Adrian Möller f7ea67b931 Fixed a bug that caused CC to report dynamic reference edges as inconsistent edges 2021-07-12 18:27:47 +02:00
Adrian Möller 9bd3a20e7b Merge remote-tracking branch 'origin/proxy-fix' into smartemf-integration 2021-07-12 13:51:28 +02:00
SebastianE 6a01079384 added an additional check for smart emf 2021-07-12 11:52:38 +02:00
SebastianE 9395672081 Merge remote-tracking branch 'origin/master' into smartemf-integration
# Conflicts:
#	org.emoflon.ibex.gt/src/org/emoflon/ibex/gt/transformations/EditorToIBeXPatternTransformation.java
#	org.emoflon.ibex.patternmodel/src-gen/org/emoflon/ibex/patternmodel/IBeXPatternModel/impl/IBeXRuleImpl.java
2021-07-12 10:53:58 +02:00
Thomas Brüning 8ca8da62db finished SimSG implementation 2021-07-08 10:14:25 +02:00
SebastianE 8068390e42 Merge remote-tracking branch 'origin/gt-forEach' into master 2021-07-05 18:22:25 +02:00
SebastianE 49ab0e5af5 fixed cases with no deletion or creation 2021-07-02 17:07:43 +02:00