diff options
| author |  OszkarSemerath <oszkar.semerath@gmail.com> | 2019-02-17 19:31:50 +0100 |
|---|---|---|
| committer | OszkarSemerath <oszkar.semerath@gmail.com> | 2019-02-17 19:31:50 +0100 |
| commit | eed3b8f6050a1dacf5555a2eefaf641c526f0fae (patch) | |
| tree | 06bd7fc31e78787dfcb3abc636acec33a287bf16 | |
| parent | Removed unnecessary logging (diff) | |
| download | VIATRA-Generator-eed3b8f6050a1dacf5555a2eefaf641c526f0fae.tar.gz VIATRA-Generator-eed3b8f6050a1dacf5555a2eefaf641c526f0fae.tar.zst VIATRA-Generator-eed3b8f6050a1dacf5555a2eefaf641c526f0fae.zip | |
Solution store diversity requirement set to 1 as default
2 files changed, 1 insertions, 3 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialModelAnnotations.genmodel b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialModelAnnotations.genmodel index 6c2f83c1..cfc356ca 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialModelAnnotations.genmodel +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialModelAnnotations.genmodel | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | <genPackages prefix="Partial2logicannotations" basePackage="hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage" | 10 | <genPackages prefix="Partial2logicannotations" basePackage="hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage" |
| 11 | disposableProviderFactory="true" ecorePackage="PartialModelAnnotations.ecore#/"> | 11 | disposableProviderFactory="true" ecorePackage="PartialModelAnnotations.ecore#/"> |
| 12 | <genClasses ecoreClass="PartialModelAnnotations.ecore#//PartialModelRelation2Assertion"> | 12 | <genClasses ecoreClass="PartialModelAnnotations.ecore#//PartialModelRelation2Assertion"> |
| 13 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference PartialModelAnnotations.ecore#//PartialModelRelation2Assertion/links"/> | ||
| 14 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialModelAnnotations.ecore#//PartialModelRelation2Assertion/targetRelation"/> | 13 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialModelAnnotations.ecore#//PartialModelRelation2Assertion/targetRelation"/> |
| 15 | </genClasses> | 14 | </genClasses> |
| 16 | </genPackages> | 15 | </genPackages> |
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionStoreWithDiversityDescriptor.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionStoreWithDiversityDescriptor.xtend index a6e49d53..1e7f18a8 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionStoreWithDiversityDescriptor.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionStoreWithDiversityDescriptor.xtend | |||
| @@ -68,8 +68,7 @@ class SolutionStoreWithDiversityDescriptor { | |||
| 68 | val differentCodes = codes.filter[!solutionCodeList.contains(it)] | 68 | val differentCodes = codes.filter[!solutionCodeList.contains(it)] |
| 69 | //println(differentCodes.size) | 69 | //println(differentCodes.size) |
| 70 | 70 | ||
| 71 | isDifferent = differentCodes.size>=3 | 71 | isDifferent = differentCodes.size>=1 |
| 72 | if(isDifferent)println(differentCodes.size) | ||
| 73 | } else { | 72 | } else { |
| 74 | throw new UnsupportedOperationException('''Unsupported diversity type: «this.granularity»''') | 73 | throw new UnsupportedOperationException('''Unsupported diversity type: «this.granularity»''') |
| 75 | } | 74 | } |