Menu
▾
▴
[UniTime-cvs] UniTime/JavaSource/org/unitime/timetable/test MasarykDefaultPreferences.java, 1.1.2.2, 1.1.2.3
|
From: Tomas M. <to...@us...> - 2010-11-11 00:31:08
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/test In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19749/JavaSource/org/unitime/timetable/test Modified Files: Tag: dev_curriculum MasarykDefaultPreferences.java Log Message: Few more changes to the default preferences. Index: MasarykDefaultPreferences.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/test/Attic/MasarykDefaultPreferences.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** MasarykDefaultPreferences.java 9 Nov 2010 12:25:50 -0000 1.1.2.2 --- MasarykDefaultPreferences.java 11 Nov 2010 00:31:00 -0000 1.1.2.3 *************** *** 90,104 **** } ! RoomGroup poc = null, mult = null; for (RoomGroup rg: (Collection<RoomGroup>)RoomGroup.getAllGlobalRoomGroups()) { ! if (rg.getAbbv().equals("MULT")) ! mult = rg; ! else if (rg.getAbbv().equals("POÄ")) poc = rg; } for (SchedulingSubpart ss: (List<SchedulingSubpart>)hibSession.createQuery( ! "select distinct s from SchedulingSubpart s inner join s.instrOfferingConfig.instructionalOffering.courseOfferings co where " + ! "co.subjectArea.department.session.uniqueId = :sessionId").setLong("sessionId", session.getUniqueId()).list()) { if (ss.getInstrOfferingConfig().isUnlimitedEnrollment()) { --- 90,109 ---- } ! RoomGroup poc = null; //, mult = null, bez = null; for (RoomGroup rg: (Collection<RoomGroup>)RoomGroup.getAllGlobalRoomGroups()) { ! if (rg.getAbbv().equals("POÄ")) poc = rg; + /* + else if (rg.getAbbv().equals("MULT")) + mult = rg; + else if (rg.getAbbv().equals("BÄŽ")) + bez = rg; + */ } for (SchedulingSubpart ss: (List<SchedulingSubpart>)hibSession.createQuery( ! "select s from SchedulingSubpart s inner join s.instrOfferingConfig.instructionalOffering.courseOfferings co where " + ! "co.subjectArea.department.session.uniqueId = :sessionId") ! .setLong("sessionId", session.getUniqueId()).list()) { if (ss.getInstrOfferingConfig().isUnlimitedEnrollment()) { *************** *** 114,118 **** if ((minPerMeeting - 5) % 50 == 0) minPerMeeting -= 5; if (ss.getMinutesPerWk() != minPerMeeting) { ! System.out.println(c.getClassLabel() + " has " + ss.getMinutesPerWk() + " minutes per meeting (should have " + minPerMeeting + ")."); if (c.getSectionNumber() == 1) { ss.setMinutesPerWk(minPerMeeting); --- 119,123 ---- if ((minPerMeeting - 5) % 50 == 0) minPerMeeting -= 5; if (ss.getMinutesPerWk() != minPerMeeting) { ! System.out.println(c.getClassLabel(hibSession) + " has " + ss.getMinutesPerWk() + " minutes per meeting (should have " + minPerMeeting + ")."); if (c.getSectionNumber() == 1) { ss.setMinutesPerWk(minPerMeeting); *************** *** 157,162 **** for (int t = 0; t < m.getNrTimes(); t++) { if (a.getTimeLocation().getStartSlot() == m.getStartSlot(t) && ! a.getTimeLocation().getDayCode() == m.getDayCode(d)) m.setPreference(d, t, PreferenceLevel.sStronglyPreferred); } TimePref tp = new TimePref(); --- 162,171 ---- for (int t = 0; t < m.getNrTimes(); t++) { if (a.getTimeLocation().getStartSlot() == m.getStartSlot(t) && ! a.getTimeLocation().getDayCode() == m.getDayCode(d)) { ! for (int tt = Math.max(0, t - 1); tt < Math.min(m.getNrTimes(), t + 2); tt++) ! for (int dd = 0; dd < m.getNrDays(); dd++) ! m.setPreference(dd, tt, PreferenceLevel.sPreferred); m.setPreference(d, t, PreferenceLevel.sStronglyPreferred); + } } TimePref tp = new TimePref(); *************** *** 175,186 **** c.getPreferences().add(rp); } else { ! if (l.getCapacity() == 0) { c.setRoomRatio(0f); - RoomPref rp = new RoomPref(); - rp.setOwner(c); rp.setPrefLevel(PreferenceLevel.getPreferenceLevel(PreferenceLevel.sStronglyPreferred)); ! rp.setRoom(l); ! c.getPreferences().add(rp); } BuildingPref bp = new BuildingPref(); bp.setOwner(c); --- 184,199 ---- c.getPreferences().add(rp); } else { ! RoomPref rp = new RoomPref(); ! rp.setOwner(c); ! if (l.getRoomGroups().isEmpty()) { ! rp.setPrefLevel(PreferenceLevel.getPreferenceLevel(PreferenceLevel.sRequired)); ! } else if (l.getCapacity() == 0) { c.setRoomRatio(0f); rp.setPrefLevel(PreferenceLevel.getPreferenceLevel(PreferenceLevel.sStronglyPreferred)); ! } else { ! rp.setPrefLevel(PreferenceLevel.getPreferenceLevel(PreferenceLevel.sPreferred)); } + rp.setRoom(l); + c.getPreferences().add(rp); BuildingPref bp = new BuildingPref(); bp.setOwner(c); *************** *** 192,196 **** } } - boolean other = true; for (RoomGroup rg: l.getRoomGroups()) { if (rg.isGlobal() && rg.getAbbv().equals("MULT")) { --- 205,208 ---- *************** *** 200,204 **** gp.setRoomGroup(rg); c.getPreferences().add(gp); ! other = false; } else if (rg.isGlobal() && rg.getAbbv().equals("POÄ")) { RoomGroupPref gp = new RoomGroupPref(); --- 212,220 ---- gp.setRoomGroup(rg); c.getPreferences().add(gp); ! RoomGroupPref gp2 = new RoomGroupPref(); ! gp2.setOwner(c); ! gp2.setPrefLevel(PreferenceLevel.getPreferenceLevel(PreferenceLevel.sPreferred)); ! gp2.setRoomGroup(poc); ! c.getPreferences().add(gp2); } else if (rg.isGlobal() && rg.getAbbv().equals("POÄ")) { RoomGroupPref gp = new RoomGroupPref(); *************** *** 207,229 **** gp.setRoomGroup(rg); c.getPreferences().add(gp); ! other = false; ! } ! } ! if (other && l instanceof Room) { ! if (poc != null) { ! RoomGroupPref gp = new RoomGroupPref(); ! gp.setPrefLevel(PreferenceLevel.getPreferenceLevel(PreferenceLevel.sStronglyDiscouraged)); ! gp.setOwner(c); ! gp.setRoomGroup(poc); ! c.getPreferences().add(gp); ! } ! if (mult != null) { RoomGroupPref gp = new RoomGroupPref(); ! gp.setPrefLevel(PreferenceLevel.getPreferenceLevel(PreferenceLevel.sDiscouraged)); gp.setOwner(c); ! gp.setRoomGroup(mult); c.getPreferences().add(gp); } - } } --- 223,238 ---- gp.setRoomGroup(rg); c.getPreferences().add(gp); ! } else if (rg.isGlobal() && rg.getAbbv().equals("BÄŽ")) { RoomGroupPref gp = new RoomGroupPref(); ! gp.setPrefLevel(PreferenceLevel.getPreferenceLevel(PreferenceLevel.sStronglyPreferred)); gp.setOwner(c); ! gp.setRoomGroup(rg); c.getPreferences().add(gp); + RoomGroupPref gp2 = new RoomGroupPref(); + gp2.setOwner(c); + gp2.setPrefLevel(PreferenceLevel.getPreferenceLevel(PreferenceLevel.sStronglyDiscouraged)); + gp2.setRoomGroup(poc); + c.getPreferences().add(gp2); } } } *************** *** 232,237 **** hibSession.saveOrUpdate(c); } } - hibSession.flush(); --- 241,246 ---- hibSession.saveOrUpdate(c); } + hibSession.flush(); } hibSession.flush(); |
