Commit 5a5ba9b9 authored by Klaus Hamberger's avatar Klaus Hamberger
Browse files

Debugged "last married"-restriction in CircuitFinder.

git-svn-id: svn+ssh://svn.code.sf.net/p/tip-puck/code/trunk@2318 fbf60bc9-78ff-467a-80f5-d9f1d8e511fc
parent 5b8a3621
......@@ -52,6 +52,7 @@ public class CircuitFinder {
Individuals targetDomain;
private Individuals searchDomain;
private Individuals linkDomain;
private Families familyCompareDomain;
Families familyDomain;
Relations relationDomain;
int lastId;
......@@ -403,6 +404,7 @@ public class CircuitFinder {
this.setSearchDomain(segmentation.getAllIndividuals());
this.relationDomain = segmentation.getCurrentRelations();
}
this.familyCompareDomain = segmentation.getAllFamilies();
// initialize relation and symmetry types
this.closingRelationType = criteria.getClosingRelation();
......@@ -1182,10 +1184,10 @@ public class CircuitFinder {
result = !targetDomain.contains(ego) || !targetDomain.contains(alter);
}
break;
case LASTMARRIED:
/* case LASTMARRIED:
result = !targetDomain.contains(ego) && !targetDomain.contains(alter);
break;
/* case EGO:
case EGO:
result = !targetDomain.contains(ego);
break;*/
case SOME:
......@@ -1225,7 +1227,8 @@ public class CircuitFinder {
break;
case LASTMARRIED:
// result = !targetDomain.contains(chain.getLastMarried());
result = (chain.getLastMarriage(familyDomain)==null);
result = (!familyDomain.contains(chain.getLastMarriage(familyCompareDomain)));
break;
/* case EGO:
result = !targetDomain.contains(chain.getFirst());
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment