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/impl/ErrorResultImpl.java | 4 ++- .../impl/InsuficientResourcesResultImpl.java | 4 ++- .../logicresult/impl/IntStatisticEntryImpl.java | 4 ++- .../model/logicresult/impl/LogicResultImpl.java | 9 ++++- .../logicresult/impl/LogicresultFactoryImpl.java | 10 ++++++ .../logicresult/impl/LogicresultPackageImpl.java | 41 +++++++++++++++++++--- .../model/logicresult/impl/ModelResultImpl.java | 6 +++- .../logicresult/impl/RealStatisticEntryImpl.java | 4 ++- .../model/logicresult/impl/StatisticEntryImpl.java | 4 ++- .../model/logicresult/impl/StatisticsImpl.java | 9 ++++- .../logicresult/impl/StringStatisticEntryImpl.java | 4 ++- 11 files changed, 85 insertions(+), 14 deletions(-) (limited to 'Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl') diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/ErrorResultImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/ErrorResultImpl.java index 579bc772..979f4778 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/ErrorResultImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/ErrorResultImpl.java @@ -69,6 +69,7 @@ public class ErrorResultImpl extends UnknownResultImpl implements ErrorResult { * * @generated */ + @Override public String getMessage() { return message; } @@ -78,6 +79,7 @@ public class ErrorResultImpl extends UnknownResultImpl implements ErrorResult { * * @generated */ + @Override public void setMessage(String newMessage) { String oldMessage = message; message = newMessage; @@ -152,7 +154,7 @@ public class ErrorResultImpl extends UnknownResultImpl implements ErrorResult { public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (message: "); result.append(message); result.append(')'); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/InsuficientResourcesResultImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/InsuficientResourcesResultImpl.java index 3f8d7ebf..3febc803 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/InsuficientResourcesResultImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/InsuficientResourcesResultImpl.java @@ -69,6 +69,7 @@ public class InsuficientResourcesResultImpl extends UnknownResultImpl implements * * @generated */ + @Override public String getResourceName() { return resourceName; } @@ -78,6 +79,7 @@ public class InsuficientResourcesResultImpl extends UnknownResultImpl implements * * @generated */ + @Override public void setResourceName(String newResourceName) { String oldResourceName = resourceName; resourceName = newResourceName; @@ -152,7 +154,7 @@ public class InsuficientResourcesResultImpl extends UnknownResultImpl implements public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (resourceName: "); result.append(resourceName); result.append(')'); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/IntStatisticEntryImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/IntStatisticEntryImpl.java index e8bedf70..663f9014 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/IntStatisticEntryImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/IntStatisticEntryImpl.java @@ -69,6 +69,7 @@ public class IntStatisticEntryImpl extends StatisticEntryImpl implements IntStat * * @generated */ + @Override public int getValue() { return value; } @@ -78,6 +79,7 @@ public class IntStatisticEntryImpl extends StatisticEntryImpl implements IntStat * * @generated */ + @Override public void setValue(int newValue) { int oldValue = value; value = newValue; @@ -152,7 +154,7 @@ public class IntStatisticEntryImpl extends StatisticEntryImpl implements IntStat public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicResultImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicResultImpl.java index 1bd5c833..a49e0bce 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicResultImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicResultImpl.java @@ -111,6 +111,7 @@ public abstract class LogicResultImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public LogicProblem getProblem() { if (problem != null && problem.eIsProxy()) { InternalEObject oldProblem = (InternalEObject)problem; @@ -137,6 +138,7 @@ public abstract class LogicResultImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setProblem(LogicProblem newProblem) { LogicProblem oldProblem = problem; problem = newProblem; @@ -149,6 +151,7 @@ public abstract class LogicResultImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public Statistics getStatistics() { return statistics; } @@ -173,6 +176,7 @@ public abstract class LogicResultImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setStatistics(Statistics newStatistics) { if (newStatistics != statistics) { NotificationChain msgs = null; @@ -192,6 +196,7 @@ public abstract class LogicResultImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public Object getTrace() { return trace; } @@ -201,6 +206,7 @@ public abstract class LogicResultImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setTrace(Object newTrace) { Object oldTrace = trace; trace = newTrace; @@ -213,6 +219,7 @@ public abstract class LogicResultImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public EList getRepresentation() { if (representation == null) { representation = new EDataTypeUniqueEList(Object.class, this, LogicresultPackage.LOGIC_RESULT__REPRESENTATION); @@ -334,7 +341,7 @@ public abstract class LogicResultImpl extends MinimalEObjectImpl.Container imple public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (trace: "); result.append(trace); result.append(", representation: "); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicresultFactoryImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicresultFactoryImpl.java index 5a102523..1bbc4942 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicresultFactoryImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicresultFactoryImpl.java @@ -75,6 +75,7 @@ public class LogicresultFactoryImpl extends EFactoryImpl implements LogicresultF * * @generated */ + @Override public ModelResult createModelResult() { ModelResultImpl modelResult = new ModelResultImpl(); return modelResult; @@ -85,6 +86,7 @@ public class LogicresultFactoryImpl extends EFactoryImpl implements LogicresultF * * @generated */ + @Override public InconsistencyResult createInconsistencyResult() { InconsistencyResultImpl inconsistencyResult = new InconsistencyResultImpl(); return inconsistencyResult; @@ -95,6 +97,7 @@ public class LogicresultFactoryImpl extends EFactoryImpl implements LogicresultF * * @generated */ + @Override public InsuficientResourcesResult createInsuficientResourcesResult() { InsuficientResourcesResultImpl insuficientResourcesResult = new InsuficientResourcesResultImpl(); return insuficientResourcesResult; @@ -105,6 +108,7 @@ public class LogicresultFactoryImpl extends EFactoryImpl implements LogicresultF * * @generated */ + @Override public ErrorResult createErrorResult() { ErrorResultImpl errorResult = new ErrorResultImpl(); return errorResult; @@ -115,6 +119,7 @@ public class LogicresultFactoryImpl extends EFactoryImpl implements LogicresultF * * @generated */ + @Override public Statistics createStatistics() { StatisticsImpl statistics = new StatisticsImpl(); return statistics; @@ -125,6 +130,7 @@ public class LogicresultFactoryImpl extends EFactoryImpl implements LogicresultF * * @generated */ + @Override public UndecidableResult createUndecidableResult() { UndecidableResultImpl undecidableResult = new UndecidableResultImpl(); return undecidableResult; @@ -135,6 +141,7 @@ public class LogicresultFactoryImpl extends EFactoryImpl implements LogicresultF * * @generated */ + @Override public IntStatisticEntry createIntStatisticEntry() { IntStatisticEntryImpl intStatisticEntry = new IntStatisticEntryImpl(); return intStatisticEntry; @@ -145,6 +152,7 @@ public class LogicresultFactoryImpl extends EFactoryImpl implements LogicresultF * * @generated */ + @Override public RealStatisticEntry createRealStatisticEntry() { RealStatisticEntryImpl realStatisticEntry = new RealStatisticEntryImpl(); return realStatisticEntry; @@ -155,6 +163,7 @@ public class LogicresultFactoryImpl extends EFactoryImpl implements LogicresultF * * @generated */ + @Override public StringStatisticEntry createStringStatisticEntry() { StringStatisticEntryImpl stringStatisticEntry = new StringStatisticEntryImpl(); return stringStatisticEntry; @@ -165,6 +174,7 @@ public class LogicresultFactoryImpl extends EFactoryImpl implements LogicresultF * * @generated */ + @Override public LogicresultPackage getLogicresultPackage() { return (LogicresultPackage)getEPackage(); } diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicresultPackageImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicresultPackageImpl.java index 8b0e0605..e67784d2 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicresultPackageImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/LogicresultPackageImpl.java @@ -151,7 +151,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link LogicresultPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -165,13 +165,16 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP if (isInited) return (LogicresultPackage)EPackage.Registry.INSTANCE.getEPackage(LogicresultPackage.eNS_URI); // Obtain or create and register package - LogicresultPackageImpl theLogicresultPackage = (LogicresultPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LogicresultPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LogicresultPackageImpl()); + Object registeredLogicresultPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LogicresultPackageImpl theLogicresultPackage = registeredLogicresultPackage instanceof LogicresultPackageImpl ? (LogicresultPackageImpl)registeredLogicresultPackage : new LogicresultPackageImpl(); isInited = true; // Obtain or create and register interdependencies - LogiclanguagePackageImpl theLogiclanguagePackage = (LogiclanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LogiclanguagePackage.eNS_URI) instanceof LogiclanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LogiclanguagePackage.eNS_URI) : LogiclanguagePackage.eINSTANCE); - LogicproblemPackageImpl theLogicproblemPackage = (LogicproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LogicproblemPackage.eNS_URI) instanceof LogicproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LogicproblemPackage.eNS_URI) : LogicproblemPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LogiclanguagePackage.eNS_URI); + LogiclanguagePackageImpl theLogiclanguagePackage = (LogiclanguagePackageImpl)(registeredPackage instanceof LogiclanguagePackageImpl ? registeredPackage : LogiclanguagePackage.eINSTANCE); + registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LogicproblemPackage.eNS_URI); + LogicproblemPackageImpl theLogicproblemPackage = (LogicproblemPackageImpl)(registeredPackage instanceof LogicproblemPackageImpl ? registeredPackage : LogicproblemPackage.eINSTANCE); // Create package meta-data objects theLogicresultPackage.createPackageContents(); @@ -186,7 +189,6 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP // Mark meta-data to indicate it can't be changed theLogicresultPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(LogicresultPackage.eNS_URI, theLogicresultPackage); return theLogicresultPackage; @@ -197,6 +199,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getLogicResult() { return logicResultEClass; } @@ -206,6 +209,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EReference getLogicResult_Problem() { return (EReference)logicResultEClass.getEStructuralFeatures().get(0); } @@ -215,6 +219,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EReference getLogicResult_Statistics() { return (EReference)logicResultEClass.getEStructuralFeatures().get(1); } @@ -224,6 +229,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getLogicResult_Trace() { return (EAttribute)logicResultEClass.getEStructuralFeatures().get(2); } @@ -233,6 +239,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getLogicResult_Representation() { return (EAttribute)logicResultEClass.getEStructuralFeatures().get(3); } @@ -242,6 +249,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getModelResult() { return modelResultEClass; } @@ -251,6 +259,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getModelResult_MaxInteger() { return (EAttribute)modelResultEClass.getEStructuralFeatures().get(0); } @@ -260,6 +269,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getModelResult_MinInteger() { return (EAttribute)modelResultEClass.getEStructuralFeatures().get(1); } @@ -269,6 +279,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getInconsistencyResult() { return inconsistencyResultEClass; } @@ -278,6 +289,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getUnknownResult() { return unknownResultEClass; } @@ -287,6 +299,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getInsuficientResourcesResult() { return insuficientResourcesResultEClass; } @@ -296,6 +309,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getInsuficientResourcesResult_ResourceName() { return (EAttribute)insuficientResourcesResultEClass.getEStructuralFeatures().get(0); } @@ -305,6 +319,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getErrorResult() { return errorResultEClass; } @@ -314,6 +329,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getErrorResult_Message() { return (EAttribute)errorResultEClass.getEStructuralFeatures().get(0); } @@ -323,6 +339,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getStatistics() { return statisticsEClass; } @@ -332,6 +349,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EReference getStatistics_Entries() { return (EReference)statisticsEClass.getEStructuralFeatures().get(0); } @@ -341,6 +359,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getStatistics_TransformationTime() { return (EAttribute)statisticsEClass.getEStructuralFeatures().get(1); } @@ -350,6 +369,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getStatistics_SolverTime() { return (EAttribute)statisticsEClass.getEStructuralFeatures().get(2); } @@ -359,6 +379,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getStatistics_SolverMemory() { return (EAttribute)statisticsEClass.getEStructuralFeatures().get(3); } @@ -368,6 +389,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getStatisticEntry() { return statisticEntryEClass; } @@ -377,6 +399,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getStatisticEntry_Name() { return (EAttribute)statisticEntryEClass.getEStructuralFeatures().get(0); } @@ -386,6 +409,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getUndecidableResult() { return undecidableResultEClass; } @@ -395,6 +419,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getIntStatisticEntry() { return intStatisticEntryEClass; } @@ -404,6 +429,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getIntStatisticEntry_Value() { return (EAttribute)intStatisticEntryEClass.getEStructuralFeatures().get(0); } @@ -413,6 +439,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getRealStatisticEntry() { return realStatisticEntryEClass; } @@ -422,6 +449,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getRealStatisticEntry_Value() { return (EAttribute)realStatisticEntryEClass.getEStructuralFeatures().get(0); } @@ -431,6 +459,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EClass getStringStatisticEntry() { return stringStatisticEntryEClass; } @@ -440,6 +469,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public EAttribute getStringStatisticEntry_Value() { return (EAttribute)stringStatisticEntryEClass.getEStructuralFeatures().get(0); } @@ -449,6 +479,7 @@ public class LogicresultPackageImpl extends EPackageImpl implements LogicresultP * * @generated */ + @Override public LogicresultFactory getLogicresultFactory() { return (LogicresultFactory)getEFactoryInstance(); } diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/ModelResultImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/ModelResultImpl.java index 63a15a81..5a601ae8 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/ModelResultImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/ModelResultImpl.java @@ -90,6 +90,7 @@ public class ModelResultImpl extends LogicResultImpl implements ModelResult { * * @generated */ + @Override public int getMaxInteger() { return maxInteger; } @@ -99,6 +100,7 @@ public class ModelResultImpl extends LogicResultImpl implements ModelResult { * * @generated */ + @Override public void setMaxInteger(int newMaxInteger) { int oldMaxInteger = maxInteger; maxInteger = newMaxInteger; @@ -111,6 +113,7 @@ public class ModelResultImpl extends LogicResultImpl implements ModelResult { * * @generated */ + @Override public int getMinInteger() { return minInteger; } @@ -120,6 +123,7 @@ public class ModelResultImpl extends LogicResultImpl implements ModelResult { * * @generated */ + @Override public void setMinInteger(int newMinInteger) { int oldMinInteger = minInteger; minInteger = newMinInteger; @@ -204,7 +208,7 @@ public class ModelResultImpl extends LogicResultImpl implements ModelResult { public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (maxInteger: "); result.append(maxInteger); result.append(", minInteger: "); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/RealStatisticEntryImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/RealStatisticEntryImpl.java index ed09f0df..464a3b1a 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/RealStatisticEntryImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/RealStatisticEntryImpl.java @@ -69,6 +69,7 @@ public class RealStatisticEntryImpl extends StatisticEntryImpl implements RealSt * * @generated */ + @Override public double getValue() { return value; } @@ -78,6 +79,7 @@ public class RealStatisticEntryImpl extends StatisticEntryImpl implements RealSt * * @generated */ + @Override public void setValue(double newValue) { double oldValue = value; value = newValue; @@ -152,7 +154,7 @@ public class RealStatisticEntryImpl extends StatisticEntryImpl implements RealSt public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StatisticEntryImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StatisticEntryImpl.java index bc1c5a92..e15e2a49 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StatisticEntryImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StatisticEntryImpl.java @@ -70,6 +70,7 @@ public abstract class StatisticEntryImpl extends MinimalEObjectImpl.Container im * * @generated */ + @Override public String getName() { return name; } @@ -79,6 +80,7 @@ public abstract class StatisticEntryImpl extends MinimalEObjectImpl.Container im * * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -153,7 +155,7 @@ public abstract class StatisticEntryImpl extends MinimalEObjectImpl.Container im public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StatisticsImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StatisticsImpl.java index 77d43c97..e0cce270 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StatisticsImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StatisticsImpl.java @@ -133,6 +133,7 @@ public class StatisticsImpl extends MinimalEObjectImpl.Container implements Stat * * @generated */ + @Override public EList getEntries() { if (entries == null) { entries = new EObjectContainmentEList(StatisticEntry.class, this, LogicresultPackage.STATISTICS__ENTRIES); @@ -145,6 +146,7 @@ public class StatisticsImpl extends MinimalEObjectImpl.Container implements Stat * * @generated */ + @Override public int getTransformationTime() { return transformationTime; } @@ -154,6 +156,7 @@ public class StatisticsImpl extends MinimalEObjectImpl.Container implements Stat * * @generated */ + @Override public void setTransformationTime(int newTransformationTime) { int oldTransformationTime = transformationTime; transformationTime = newTransformationTime; @@ -166,6 +169,7 @@ public class StatisticsImpl extends MinimalEObjectImpl.Container implements Stat * * @generated */ + @Override public int getSolverTime() { return solverTime; } @@ -175,6 +179,7 @@ public class StatisticsImpl extends MinimalEObjectImpl.Container implements Stat * * @generated */ + @Override public void setSolverTime(int newSolverTime) { int oldSolverTime = solverTime; solverTime = newSolverTime; @@ -187,6 +192,7 @@ public class StatisticsImpl extends MinimalEObjectImpl.Container implements Stat * * @generated */ + @Override public int getSolverMemory() { return solverMemory; } @@ -196,6 +202,7 @@ public class StatisticsImpl extends MinimalEObjectImpl.Container implements Stat * * @generated */ + @Override public void setSolverMemory(int newSolverMemory) { int oldSolverMemory = solverMemory; solverMemory = newSolverMemory; @@ -316,7 +323,7 @@ public class StatisticsImpl extends MinimalEObjectImpl.Container implements Stat public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (transformationTime: "); result.append(transformationTime); result.append(", solverTime: "); diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StringStatisticEntryImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StringStatisticEntryImpl.java index 8698f73b..9011cf97 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StringStatisticEntryImpl.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicresult/impl/StringStatisticEntryImpl.java @@ -69,6 +69,7 @@ public class StringStatisticEntryImpl extends StatisticEntryImpl implements Stri * * @generated */ + @Override public String getValue() { return value; } @@ -78,6 +79,7 @@ public class StringStatisticEntryImpl extends StatisticEntryImpl implements Stri * * @generated */ + @Override public void setValue(String newValue) { String oldValue = value; value = newValue; @@ -152,7 +154,7 @@ public class StringStatisticEntryImpl extends StatisticEntryImpl implements Stri public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); -- cgit v1.2.3-70-g09d2