From 3e7fdbf562bbb1739a6ff4b09f86f415aaf89a56 Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Sat, 4 May 2019 15:31:47 -0400 Subject: Added aggregate expressions to logic language on the model level --- .../model/logicresult.aird | 1464 ++++++++++---------- 1 file changed, 741 insertions(+), 723 deletions(-) (limited to 'Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logicresult.aird') diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logicresult.aird b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logicresult.aird index b088b72f..486a339f 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logicresult.aird +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logicresult.aird @@ -1,740 +1,758 @@ - - logicresult.ecore - logicproblem.ecore - http://www.eclipse.org/emf/2002/Ecore - logiclanguage.ecore - - - - - - - bold + + + logicresult.ecore + logicproblem.ecore + http://www.eclipse.org/emf/2002/Ecore + logiclanguage.ecore + + + + + + + + + + + + + + + + + + + + + + + bold + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - italic - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bold - - - - - - - - bold - - - - - - - - - - - - - - - - - italic - - - - - - - - - - - - - - - - bold - - - - - - - - - - - - - - - - bold - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - bold - - - - - - - - bold - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - italic - - - - - - - - bold - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + italic + + + + + + + + - - - - - - bold - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - + + + + + + + - - - - - - bold - - - - - - - - - - labelSize - - - labelSize - + + + + + + + - - - - - - - - labelSize - - - labelSize - + + + + + + + + + + + + + + + bold - - - - - - - - - italic - - + + + + + + + bold - - - - - - - - - italic - - + + + + + + + + + + + + + + + + italic + + + + + + + + + + + + + + + + bold - - - - - - - - - italic - - + + + + + + + + + + + + + + + bold - - - - - - - - - italic - - + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + bold - - - - - - - - - italic - - + + + + + + + bold - - - - - - - - - italic - - + + + + + + + - - - - - - - - - italic - - + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + bold - - - - - - - - - italic - - + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + bold - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + bold - - - - - - bold - - - - - - - - - - - italic - - + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + bold - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + italic + + + + + + + + + + + + + + -- cgit v1.2.3-54-g00ecf