|
From: Tomas M. <to...@us...> - 2010-12-15 23:31:47
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20821/JavaSource/org/unitime/timetable/model Modified Files: TimePatternModel.java Log Message: getNormalizePreferences - ignore days that are completely prohibited Index: TimePatternModel.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/TimePatternModel.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TimePatternModel.java 1 Dec 2010 11:10:39 -0000 1.6 --- TimePatternModel.java 15 Dec 2010 23:31:39 -0000 1.7 *************** *** 344,352 **** --- 344,355 ---- for (int i = 0; i < iDays.length; i++) { double nrOfPreferencesThisDay = 0; + boolean prohibitedDay = true; for (int j = 0; j < iMinutes.length; j++) { String p = iPreferences[i][j]; if (PreferenceLevel.sRequired.equalsIgnoreCase(p)) continue; + if (!PreferenceLevel.sProhibited.equalsIgnoreCase(p)) prohibitedDay = false; if (PreferenceLevel.sProhibited.equalsIgnoreCase(p) || Integer.parseInt(p)!=0) nrOfPreferencesThisDay+=increment; } + if (prohibitedDay) continue; nrOfPreferences = Math.max(nrOfPreferences,nrOfPreferencesThisDay); } |