DMC/scipro
7
0
Fork 0
Code Issues42 Pull Requests4 Actions Projects1 Releases Wiki Activity

Fixed the matching availability level to project idea level mismatch issue.

Browse Source
This commit is contained in:
anto-gom 2012-03-20 09:28:11 +01:00
parent c509696290
commit 4537895ce3
2 changed files with 5 additions and 4 deletions
src/main/java/se/su/dsv/scipro/match
GreedyMatchingAlgorithm.java
dataobject
Availability.java

7
src/main/java/se/su/dsv/scipro/match/GreedyMatchingAlgorithm.java

@ -82,9 +82,10 @@ public class GreedyMatchingAlgorithm implements MatchingAlgorithm {
continue;
}
if(availability.getProjectClass().toString().equalsIgnoreCase(ProjectClass.BACHELOR) &&
projectIdea.getProjectClass().toString().equalsIgnoreCase(ProjectClass.MASTER)) {
logger.info("A bachelor supervisor cannot handle master ideas.");
if(!availability.getProjectClass().toString().equals(
projectIdea.getProjectClass().toString()) ) {
//logger.info("A bachelor supervisor cannot handle master ideas.");
logger.info("Supervisor availability level and project idea level aren't equal.");
continue;
}

2
src/main/java/se/su/dsv/scipro/match/dataobject/Availability.java

@ -17,7 +17,7 @@ public class Availability implements Serializable {
private Integer numCapable;
private final Employee supervisor;
public Availability(final Employee supervisor,final Long numMatched,final Integer numCapable,final ProjectClass projectClass) {
public Availability(final Employee supervisor, final Long numMatched, final Integer numCapable, final ProjectClass projectClass) {
this.supervisor = supervisor;
this.numMatched = numMatched;
this.numCapable = numCapable;