|
From: Tomas M. <to...@us...> - 2010-12-16 01:37:11
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19190/JavaSource/org/unitime/timetable/model Modified Files: TimePatternModel.java Log Message: undoing the last change - after running some tests, it did not help that much, and may disbalance the existing weightings - a better approach seems to be to set normalization decrease factor to 1.0 in a solver configuration (and alter the other time preference weights accordingly) Index: TimePatternModel.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/TimePatternModel.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TimePatternModel.java 15 Dec 2010 23:31:39 -0000 1.7 --- TimePatternModel.java 16 Dec 2010 01:37:03 -0000 1.8 *************** *** 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); } --- 344,352 ---- |