Menu
▾
▴
unitime-cvs — CVS changes
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(275) |
Jul
(81) |
Aug
(19) |
Sep
(26) |
Oct
(190) |
Nov
(118) |
Dec
(16) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(9) |
Feb
(318) |
Mar
(251) |
Apr
(354) |
May
(209) |
Jun
(261) |
Jul
(226) |
Aug
(136) |
Sep
(156) |
Oct
(30) |
Nov
(5) |
Dec
(13) |
| 2009 |
Jan
(26) |
Feb
(35) |
Mar
(63) |
Apr
(21) |
May
(26) |
Jun
(33) |
Jul
(55) |
Aug
(71) |
Sep
(23) |
Oct
(40) |
Nov
(18) |
Dec
(13) |
| 2010 |
Jan
(17) |
Feb
(98) |
Mar
(39) |
Apr
(25) |
May
(107) |
Jun
(257) |
Jul
(270) |
Aug
(206) |
Sep
(237) |
Oct
(187) |
Nov
(302) |
Dec
(187) |
| 2011 |
Jan
(63) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Tomas M. <to...@us...> - 2010-11-15 15:15:51
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/resources In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv3673/JavaSource/org/unitime/timetable/gwt/resources Modified Files: Tag: dev_curriculum StudentSectioningMessages.java StudentSectioningConstants.java Log Message: Student Course Requests page added - added ability to record student course and free time requests (pre-registration) using the Student Scheduling Assistant interface - added session status option (sectioning -- registration), Student Course Requests page is only available for academic sessions with a status enabling this feature - authenticated students should see "Course Requests" in the menu (if there is at least one academic session with this feature enabled) Index: StudentSectioningConstants.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/resources/Attic/StudentSectioningConstants.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** StudentSectioningConstants.java 9 Nov 2010 12:25:51 -0000 1.1.2.3 --- StudentSectioningConstants.java 15 Nov 2010 15:15:43 -0000 1.1.2.4 *************** *** 52,57 **** @DefaultStringArrayValue({ ! "Tip: Enter a free time (e.g., Monday 8am - 10am) or use the mouse to select it.", ! "Tip: The numbers in the selected times counts the number of overlapping standard time patterns (3x50, 2x75, 1x150), try to avoid overlapping too many of those."}) String[] freeTimeTips(); --- 52,56 ---- @DefaultStringArrayValue({ ! "Tip: Enter a free time (e.g., Monday 8am - 10am) or use the mouse to select it."}) String[] freeTimeTips(); Index: StudentSectioningMessages.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/resources/Attic/StudentSectioningMessages.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** StudentSectioningMessages.java 9 Nov 2010 12:25:51 -0000 1.1.2.3 --- StudentSectioningMessages.java 15 Nov 2010 15:15:43 -0000 1.1.2.4 *************** *** 295,298 **** --- 295,301 ---- String buttonExport(); + @DefaultMessage("<u>S</u>ave") + String buttonSave(); + @DefaultMessage("<u>L</u>ist of Classes") String tabClasses(); |
|
From: Tomas M. <to...@us...> - 2010-11-15 15:15:51
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/services In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv3673/JavaSource/org/unitime/timetable/gwt/services Modified Files: Tag: dev_curriculum SectioningServiceAsync.java SectioningService.java Log Message: Student Course Requests page added - added ability to record student course and free time requests (pre-registration) using the Student Scheduling Assistant interface - added session status option (sectioning -- registration), Student Course Requests page is only available for academic sessions with a status enabling this feature - authenticated students should see "Course Requests" in the menu (if there is at least one academic session with this feature enabled) Index: SectioningService.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/services/Attic/SectioningService.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** SectioningService.java 9 Nov 2010 12:25:48 -0000 1.1.2.4 --- SectioningService.java 15 Nov 2010 15:15:43 -0000 1.1.2.5 *************** *** 36,40 **** public interface SectioningService extends RemoteService { Collection<ClassAssignmentInterface.CourseAssignment> listCourseOfferings(Long sessionId, String query, Integer limit) throws SectioningException; ! Collection<String[]> listAcademicSessions() throws SectioningException; String retrieveCourseDetails(Long sessionId, String course) throws SectioningException; Collection<ClassAssignmentInterface.ClassAssignment> listClasses(Long sessionId, String course) throws IllegalArgumentException; --- 36,40 ---- public interface SectioningService extends RemoteService { Collection<ClassAssignmentInterface.CourseAssignment> listCourseOfferings(Long sessionId, String query, Integer limit) throws SectioningException; ! Collection<String[]> listAcademicSessions(boolean sectioning) throws SectioningException; String retrieveCourseDetails(Long sessionId, String course) throws SectioningException; Collection<ClassAssignmentInterface.ClassAssignment> listClasses(Long sessionId, String course) throws IllegalArgumentException; *************** *** 46,50 **** Boolean logOut() throws SectioningException; String whoAmI() throws SectioningException; ! String[] lastAcademicSession() throws SectioningException; CourseRequestInterface lastRequest(Long sessionId) throws SectioningException; ArrayList<ClassAssignmentInterface.ClassAssignment> lastResult(Long sessionId) throws SectioningException; --- 46,50 ---- Boolean logOut() throws SectioningException; String whoAmI() throws SectioningException; ! String[] lastAcademicSession(boolean sectioning) throws SectioningException; CourseRequestInterface lastRequest(Long sessionId) throws SectioningException; ArrayList<ClassAssignmentInterface.ClassAssignment> lastResult(Long sessionId) throws SectioningException; Index: SectioningServiceAsync.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/services/Attic/SectioningServiceAsync.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** SectioningServiceAsync.java 9 Nov 2010 12:25:48 -0000 1.1.2.3 --- SectioningServiceAsync.java 15 Nov 2010 15:15:43 -0000 1.1.2.4 *************** *** 34,38 **** public interface SectioningServiceAsync { void listCourseOfferings(Long sessionId, String query, Integer limit, AsyncCallback<Collection<ClassAssignmentInterface.CourseAssignment>> callback) throws SectioningException; ! void listAcademicSessions(AsyncCallback<Collection<String[]>> callback) throws SectioningException; void retrieveCourseDetails(Long sessionId, String course, AsyncCallback<String> callback) throws SectioningException; void listClasses(Long sessionId, String course, AsyncCallback<Collection<ClassAssignmentInterface.ClassAssignment>> callback) throws IllegalArgumentException; --- 34,38 ---- public interface SectioningServiceAsync { void listCourseOfferings(Long sessionId, String query, Integer limit, AsyncCallback<Collection<ClassAssignmentInterface.CourseAssignment>> callback) throws SectioningException; ! void listAcademicSessions(boolean sectioning, AsyncCallback<Collection<String[]>> callback) throws SectioningException; void retrieveCourseDetails(Long sessionId, String course, AsyncCallback<String> callback) throws SectioningException; void listClasses(Long sessionId, String course, AsyncCallback<Collection<ClassAssignmentInterface.ClassAssignment>> callback) throws IllegalArgumentException; *************** *** 44,48 **** void logOut(AsyncCallback<Boolean> callback) throws SectioningException; void whoAmI(AsyncCallback<String> callback) throws SectioningException; ! void lastAcademicSession(AsyncCallback<String[]> callback) throws SectioningException; void lastRequest(Long sessionId, AsyncCallback<CourseRequestInterface> callback) throws SectioningException; void lastResult(Long sessionId, AsyncCallback<ArrayList<ClassAssignmentInterface.ClassAssignment>> callback) throws SectioningException; --- 44,48 ---- void logOut(AsyncCallback<Boolean> callback) throws SectioningException; void whoAmI(AsyncCallback<String> callback) throws SectioningException; ! void lastAcademicSession(boolean sectioning, AsyncCallback<String[]> callback) throws SectioningException; void lastRequest(Long sessionId, AsyncCallback<CourseRequestInterface> callback) throws SectioningException; void lastResult(Long sessionId, AsyncCallback<ArrayList<ClassAssignmentInterface.ClassAssignment>> callback) throws SectioningException; |
|
From: Tomas M. <to...@us...> - 2010-11-15 15:15:51
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/action In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv3673/JavaSource/org/unitime/timetable/action Modified Files: Tag: dev_curriculum DeptStatusTypeEditAction.java Log Message: Student Course Requests page added - added ability to record student course and free time requests (pre-registration) using the Student Scheduling Assistant interface - added session status option (sectioning -- registration), Student Course Requests page is only available for academic sessions with a status enabling this feature - authenticated students should see "Course Requests" in the menu (if there is at least one academic session with this feature enabled) Index: DeptStatusTypeEditAction.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/action/DeptStatusTypeEditAction.java,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -C2 -d -r1.6.2.2 -r1.6.2.3 *** DeptStatusTypeEditAction.java 9 Nov 2010 12:25:49 -0000 1.6.2.2 --- DeptStatusTypeEditAction.java 15 Nov 2010 15:15:42 -0000 1.6.2.3 *************** *** 302,306 **** if (s.canSectioningStudents()) { if (rights.length()>0) rights+="; "; ! rights += "sectioning"; } if (s.canNoRoleReportExamFinal() || s.canNoRoleReportExamMidterm() || s.canNoRoleReportClass()) { --- 302,309 ---- if (s.canSectioningStudents()) { if (rights.length()>0) rights+="; "; ! rights += "assistant"; ! } else if (s.canPreRegisterStudents()) { ! if (rights.length()>0) rights+="; "; ! rights += "registration"; } if (s.canNoRoleReportExamFinal() || s.canNoRoleReportExamMidterm() || s.canNoRoleReportClass()) { |
|
From: Nightly B. <no...@un...> - 2010-11-15 00:00:04
|
Download the resultant file at http://www.unitime.org/uct_builds.php, see the attached build and change logs for more details. |
|
From: Tomas M. <to...@us...> - 2010-11-14 19:04:28
|
Update of /cvsroot/unitime/UniTime In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv23800 Modified Files: Tag: dev_curriculum build.xml Log Message: fixed the check-jsp task Index: build.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/build.xml,v retrieving revision 1.16.2.14 retrieving revision 1.16.2.15 diff -C2 -d -r1.16.2.14 -r1.16.2.15 *** build.xml 11 Nov 2010 21:18:16 -0000 1.16.2.14 --- build.xml 14 Nov 2010 19:04:20 -0000 1.16.2.15 *************** *** 461,480 **** <target name="check-jsp" depends="init,check-tomcat-home"> ! <java classname="org.apache.jasper.JspC" fork="yes"> ! <arg line="-uriroot ${jsp.dir} -d ${temp.dir} -p org.apache.jsp -webapp ${jsp.dir} -v -compile -source 1.5 -target 1.5" /> ! <classpath> ! <fileset dir="${lib.dir}"> ! <include name="*.jar"/> ! </fileset> ! <fileset dir="${env.TOMCAT_HOME}/lib"> ! <include name="*.jar"/> ! </fileset> ! <fileset dir="${env.TOMCAT_HOME}/bin"> ! <include name="*.jar"/> ! </fileset> ! <fileset dir="${3rd_party.dir}"> ! <include name="*.jar"/> ! </fileset> ! </classpath> </java> </target> --- 461,480 ---- <target name="check-jsp" depends="init,check-tomcat-home"> ! <path id="build.classpath"> ! <fileset dir="${lib.dir}"> ! <include name="*.jar"/> ! </fileset> ! <fileset dir="${3rd_party.dir}"> ! <include name="*.jar" /> ! </fileset> ! </path> ! <javac source="1.5" target="1.5" destdir="${build.dir}" includes="org/unitime/commons/ant/CreateBaseModelFromXml.java" debug="true" includeantruntime="false"> ! <src path="${src.dir}" /> ! <classpath refid="build.classpath"/> ! </javac> ! <java classname="org.apache.jasper.JspC" fork="yes" failonerror="true"> ! <arg line="-uriroot ${jsp.dir} -d ${temp.dir} -p org.apache.jsp -webapp ${jsp.dir} -v -compile" /> ! <classpath refid="build.classpath"/> ! <classpath path="${build.dir}"/> </java> </target> |
|
From: Tomas M. <to...@us...> - 2010-11-14 19:04:11
|
Update of /cvsroot/unitime/UniTime/WebContent/test In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv23728/WebContent/test Modified Files: Tag: dev_curriculum tpcomb.jsp tpall.jsp Log Message: TimePattern.findAll now returns List<TimePattern> Index: tpcomb.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/test/tpcomb.jsp,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** tpcomb.jsp 9 Nov 2010 12:25:51 -0000 1.3.2.1 --- tpcomb.jsp 14 Nov 2010 19:04:03 -0000 1.3.2.2 *************** *** 56,60 **** </select> <input type='submit' value='Update' accesskey="0"/><br><hr> <% ! Vector timePatterns = TimePattern.findAll(sessionId,true); for (Iterator i=timePatterns.iterator();i.hasNext();) { TimePattern tp = (TimePattern)i.next(); --- 56,60 ---- </select> <input type='submit' value='Update' accesskey="0"/><br><hr> <% ! List<TimePattern> timePatterns = TimePattern.findAll(sessionId,true); for (Iterator i=timePatterns.iterator();i.hasNext();) { TimePattern tp = (TimePattern)i.next(); Index: tpall.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/test/tpall.jsp,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** tpall.jsp 9 Nov 2010 12:25:51 -0000 1.3.2.1 --- tpall.jsp 14 Nov 2010 19:04:03 -0000 1.3.2.2 *************** *** 33,37 **** try { Long sessionId = Session.defaultSession().getUniqueId(); ! Vector timePatterns = TimePattern.findAll(sessionId,true); boolean canEdit = request.getParameter("canEdit")==null || "1".equals(request.getParameter("canEdit")); for (Iterator i=timePatterns.iterator();i.hasNext();) { --- 33,37 ---- try { Long sessionId = Session.defaultSession().getUniqueId(); ! List<TimePattern> timePatterns = TimePattern.findAll(sessionId,true); boolean canEdit = request.getParameter("canEdit")==null || "1".equals(request.getParameter("canEdit")); for (Iterator i=timePatterns.iterator();i.hasNext();) { |
|
From: Tomas M. <to...@us...> - 2010-11-14 19:03:25
|
Update of /cvsroot/unitime/UniTime/WebContent/tt In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv23480/WebContent/tt Modified Files: Tag: dev_curriculum solutions.jsp solver.jsp Log Message: API changes of the new constraint solver library (mostly Hashtable -> Map changes) -- forgot to fix the JSPs Index: solutions.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/tt/solutions.jsp,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -C2 -d -r1.4.2.2 -r1.4.2.3 *** solutions.jsp 9 Nov 2010 12:25:48 -0000 1.4.2.2 --- solutions.jsp 14 Nov 2010 19:03:17 -0000 1.4.2.3 *************** *** 216,225 **** <TD valign="top">Note:</TD><TD><html:textarea property="solverNote" rows="4" cols="80" disabled="<%=solver.isWorking()%>"/></TD> </TR> ! <% Hashtable info = solver.currentSolutionInfo(); ! Vector keys = new Vector(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (Enumeration e=keys.elements();e.hasMoreElements();) { ! String key = (String)e.nextElement(); ! String val = info.get(key).toString(); %> <TR><TD nowrap><%=key%>:</TD><TD><%=val%></TD></TR> --- 216,224 ---- <TD valign="top">Note:</TD><TD><html:textarea property="solverNote" rows="4" cols="80" disabled="<%=solver.isWorking()%>"/></TD> </TR> ! <% Map<String,String> info = solver.currentSolutionInfo(); ! List<String> keys = new ArrayList<String>(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (String key: keys) { ! String val = info.get(key); %> <TR><TD nowrap><%=key%>:</TD><TD><%=val%></TD></TR> Index: solver.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/tt/solver.jsp,v retrieving revision 1.6.2.3 retrieving revision 1.6.2.4 diff -C2 -d -r1.6.2.3 -r1.6.2.4 *** solver.jsp 9 Nov 2010 12:25:48 -0000 1.6.2.3 --- solver.jsp 14 Nov 2010 19:03:17 -0000 1.6.2.4 *************** *** 310,314 **** } } ! Hashtable info = solver.bestSolutionInfo(); if (info!=null) { %> --- 310,314 ---- } } ! Map<String,String> info = solver.bestSolutionInfo(); if (info!=null) { %> *************** *** 321,329 **** </TR> <% ! Vector keys = new Vector(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (Enumeration e=keys.elements();e.hasMoreElements();) { ! String key = (String)e.nextElement(); ! String val = info.get(key).toString(); %> <TR><TD><%=key%>:</TD><TD><%=val%></TD></TR> --- 321,328 ---- </TR> <% ! List<String> keys = new ArrayList<String>(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (String key: keys) { ! String val = info.get(key); %> <TR><TD><%=key%>:</TD><TD><%=val%></TD></TR> *************** *** 376,384 **** <% info = solver.currentSolutionInfo(); ! Vector keys = new Vector(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (Enumeration e=keys.elements();e.hasMoreElements();) { ! String key = (String)e.nextElement(); ! String val = info.get(key).toString(); %> <TR><TD><%=key%>:</TD><TD><%=val%></TD></TR> --- 375,382 ---- <% info = solver.currentSolutionInfo(); ! List<String> keys = new ArrayList<String>(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (String key: keys) { ! String val = info.get(key); %> <TR><TD><%=key%>:</TD><TD><%=val%></TD></TR> |
|
From: Tomas M. <to...@us...> - 2010-11-14 19:03:25
|
Update of /cvsroot/unitime/UniTime/WebContent/exam In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv23480/WebContent/exam Modified Files: Tag: dev_curriculum examSolver.jsp Log Message: API changes of the new constraint solver library (mostly Hashtable -> Map changes) -- forgot to fix the JSPs Index: examSolver.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/exam/examSolver.jsp,v retrieving revision 1.7.2.3 retrieving revision 1.7.2.4 diff -C2 -d -r1.7.2.3 -r1.7.2.4 *** examSolver.jsp 9 Nov 2010 12:25:49 -0000 1.7.2.3 --- examSolver.jsp 14 Nov 2010 19:03:17 -0000 1.7.2.4 *************** *** 215,219 **** if (hibSession.getTransaction()==null || !hibSession.getTransaction().isActive()) tx = hibSession.beginTransaction(); ! Hashtable info = solver.bestSolutionInfo(); if (info!=null) { %> --- 215,219 ---- if (hibSession.getTransaction()==null || !hibSession.getTransaction().isActive()) tx = hibSession.beginTransaction(); ! Map<String,String> info = solver.currentSolutionInfo(); if (info!=null) { %> *************** *** 226,234 **** </TR> <% ! Vector keys = new Vector(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (Enumeration e=keys.elements();e.hasMoreElements();) { ! String key = (String)e.nextElement(); ! String val = info.get(key).toString(); %> <TR><TD><%=key%>:</TD><TD><%=val%></TD></TR> --- 226,233 ---- </TR> <% ! List<String> keys = new ArrayList<String>(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (String key: keys) { ! String val = info.get(key); %> <TR><TD><%=key%>:</TD><TD><%=val%></TD></TR> *************** *** 249,257 **** <% info = solver.currentSolutionInfo(); ! Vector keys = new Vector(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (Enumeration e=keys.elements();e.hasMoreElements();) { ! String key = (String)e.nextElement(); ! String val = info.get(key).toString(); %> <TR><TD><%=key%>:</TD><TD><%=val%></TD></TR> --- 248,255 ---- <% info = solver.currentSolutionInfo(); ! List<String> keys = new ArrayList<String>(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (String key: keys) { ! String val = info.get(key); %> <TR><TD><%=key%>:</TD><TD><%=val%></TD></TR> |
|
From: Tomas M. <to...@us...> - 2010-11-14 19:03:25
|
Update of /cvsroot/unitime/UniTime/WebContent/sct In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv23480/WebContent/sct Modified Files: Tag: dev_curriculum studentSolver.jsp Log Message: API changes of the new constraint solver library (mostly Hashtable -> Map changes) -- forgot to fix the JSPs Index: studentSolver.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/sct/studentSolver.jsp,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -d -r1.2.2.3 -r1.2.2.4 *** studentSolver.jsp 9 Nov 2010 12:25:53 -0000 1.2.2.3 --- studentSolver.jsp 14 Nov 2010 19:03:17 -0000 1.2.2.4 *************** *** 198,202 **** <% } else { ! Hashtable info = solver.bestSolutionInfo(); if (info!=null) { %> --- 198,202 ---- <% } else { ! Map<String, String> info = solver.bestSolutionInfo(); if (info!=null) { %> *************** *** 209,217 **** </TR> <% ! Vector keys = new Vector(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (Enumeration e=keys.elements();e.hasMoreElements();) { ! String key = (String)e.nextElement(); ! String val = info.get(key).toString(); %> <TR><TD><%=key%>:</TD><TD><%=val%></TD></TR> --- 209,216 ---- </TR> <% ! List<String> keys = new ArrayList<String>(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (String key: keys) { ! String val = info.get(key); %> <TR><TD><%=key%>:</TD><TD><%=val%></TD></TR> *************** *** 232,240 **** <% info = solver.currentSolutionInfo(); ! Vector keys = new Vector(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (Enumeration e=keys.elements();e.hasMoreElements();) { ! String key = (String)e.nextElement(); ! String val = info.get(key).toString(); %> <TR><TD><%=key%>:</TD><TD><%=val%></TD></TR> --- 231,238 ---- <% info = solver.currentSolutionInfo(); ! List<String> keys = new ArrayList<String>(info.keySet()); Collections.sort(keys,new ListSolutionsForm.InfoComparator()); ! for (String key: keys) { ! String val = info.get(key); %> <TR><TD><%=key%>:</TD><TD><%=val%></TD></TR> |
|
From: Nightly B. <no...@un...> - 2010-11-13 00:19:25
|
Download the resultant file at http://www.unitime.org/uct_builds.php, see the attached build and change logs for more details. |
|
From: Nightly B. <no...@un...> - 2010-11-12 23:56:15
|
Download the resultant file at http://www.unitime.org/uct_builds.php, see the attached build and change logs for more details. |
|
From: Tomas M. <to...@us...> - 2010-11-12 20:30:34
|
Update of /cvsroot/unitime/UniTime/WebContent/help In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv10494/WebContent/help Modified Files: Release-Notes.xml Log Message: added recent changes Index: Release-Notes.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/help/Release-Notes.xml,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** Release-Notes.xml 8 Oct 2010 17:01:50 -0000 1.69 --- Release-Notes.xml 12 Nov 2010 20:30:27 -0000 1.70 *************** *** 30,33 **** --- 30,50 ---- <title>BUG FIXES & OTHER IMPROVEMENTS</title> <item> + <name>Bug fixes</name> + <description> + <line>Edit Date Pattern: fixed ArrayIndexOutOfBoundsException when pattern offset is negative, assumption about the days of weeks corrected</line> + <line>Class Assignment: remove all related constraint infos to avoid hibernate cache issues when an orphaned constraint info is automatically deleted + <line>This should fix the ObjectNotFoundException on the Class Assignment page</line> + </line> + </description> + </item> + </category> + </release> + + <release> + <version>3.1.284</version> + <release-date>Tuesday, 19 Oct 2010</release-date> + <category> + <title>BUG FIXES & OTHER IMPROVEMENTS</title> + <item> <name>Data Exchange</name> <description> |
|
From: Tomas M. <to...@us...> - 2010-11-12 20:27:08
|
Update of /cvsroot/unitime/UniTime/WebContent/help In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8898/WebContent/help Modified Files: Tag: dev_curriculum Release-Notes.xml Log Message: fixed a typo Index: Release-Notes.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/help/Release-Notes.xml,v retrieving revision 1.62.2.14 retrieving revision 1.62.2.15 diff -C2 -d -r1.62.2.14 -r1.62.2.15 *** Release-Notes.xml 12 Nov 2010 20:26:21 -0000 1.62.2.14 --- Release-Notes.xml 12 Nov 2010 20:27:00 -0000 1.62.2.15 *************** *** 207,212 **** <line>Add Event: fixed a problem with creating a course event with >1000 students</line> <line>Enrollment Audits: Ensure the correct enrollment is used for the audit results when a student is enrolled in multiple names of a cross listed course.</line> ! <line>Date Patterens: fixed ArrayIndexOutOfBoundsException when pattern offset is negative, assumption about the days of weeks corrected</line> ! <line>Class Assignment page: remove all related constraint infos to avoid hibernate cache issues when an orphaned constraint info is automatically deleted <line>This should fix the ObjectNotFoundException on the Class Assignment page</line> </line> --- 207,212 ---- <line>Add Event: fixed a problem with creating a course event with >1000 students</line> <line>Enrollment Audits: Ensure the correct enrollment is used for the audit results when a student is enrolled in multiple names of a cross listed course.</line> ! <line>Edit Date Pattern: fixed ArrayIndexOutOfBoundsException when pattern offset is negative, assumption about the days of weeks corrected</line> ! <line>Class Assignment: remove all related constraint infos to avoid hibernate cache issues when an orphaned constraint info is automatically deleted <line>This should fix the ObjectNotFoundException on the Class Assignment page</line> </line> |
|
From: Tomas M. <to...@us...> - 2010-11-12 20:26:30
|
Update of /cvsroot/unitime/UniTime/WebContent/help In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8770/WebContent/help Modified Files: Tag: dev_curriculum Release-Notes.xml Log Message: added recent changes Index: Release-Notes.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/help/Release-Notes.xml,v retrieving revision 1.62.2.13 retrieving revision 1.62.2.14 diff -C2 -d -r1.62.2.13 -r1.62.2.14 *** Release-Notes.xml 9 Nov 2010 12:25:53 -0000 1.62.2.13 --- Release-Notes.xml 12 Nov 2010 20:26:21 -0000 1.62.2.14 *************** *** 66,69 **** --- 66,73 ---- <line>Suggestions, Class/Examination Assignment -- refresh the parent page when a new assignment is made</line> </line> + <line>Event Timetable + <line>Timetable of a room, person, department, curriculum, subject area</line> + <line>Including all events, calendar-like time grid as well as list, export to iCalendar</line> + </line> </description> </item> *************** *** 107,111 **** <line>Update of underlying technologies <line>Constraint Solver Library 1.2</line> ! <line>Hibernate 3.5, Struts 1.3.10, iText 5.0.2</line> </line> <line>Unified sending of emails</line> --- 111,115 ---- <line>Update of underlying technologies <line>Constraint Solver Library 1.2</line> ! <line>Hibernate 3.5, Struts 1.3.10, iText 5.0.2, GWT 2.1</line> </line> <line>Unified sending of emails</line> *************** *** 129,132 **** --- 133,142 ---- <line>It is now possible to create an academic session over a whole year (but not longer than a year)</line> <line>Events: when filtering rooms by non-university location room type, added ability to select the room from a drop down box</line> + <line>Rooms: added navigation</line> + <line>Added optional registration</line> + <line>License update to GNU General Public License, Version 3 (was Version 2) + <line>Added list of dependencies (including URLs, copyrights, and licenses)</line> + </line> + <line>Added query log (Page Statistics page)</line> </description> </item> *************** *** 197,200 **** --- 207,214 ---- <line>Add Event: fixed a problem with creating a course event with >1000 students</line> <line>Enrollment Audits: Ensure the correct enrollment is used for the audit results when a student is enrolled in multiple names of a cross listed course.</line> + <line>Date Patterens: fixed ArrayIndexOutOfBoundsException when pattern offset is negative, assumption about the days of weeks corrected</line> + <line>Class Assignment page: remove all related constraint infos to avoid hibernate cache issues when an orphaned constraint info is automatically deleted + <line>This should fix the ObjectNotFoundException on the Class Assignment page</line> + </line> </description> </item> |
|
From: Nightly B. <no...@un...> - 2010-11-11 23:55:11
|
Download the resultant file at http://www.unitime.org/uct_builds.php, see the attached build and change logs for more details. |
|
From: Tomas M. <to...@us...> - 2010-11-11 21:18:27
|
Update of /cvsroot/unitime/UniTime/Documentation/License In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv32743/Documentation/License Added Files: Tag: dev_curriculum dependencies.txt Log Message: Added a list of dependencies, i.e., libraries UniTime needs to run with the appropriate URLs, copyrights, and licenses. --- NEW FILE: dependencies.txt --- For The Apache Software License, Version 2.0, see http://www.apache.org/licenses/LICENSE-2.0 For the GNU licenses, see http://www.gnu.org/licenses/ cpsolver-all-1.2.jar Constraint Solver Library URL: http://cpsolver.sf.net Copyright: (C) 2006 - 2010 Tomas Muller License: GNU Lesser General Public License, Version 3.0 log4j-1.2.8.jar Log4J (Apache Logging Services) URL: http://logging.apache.org/log4j/1.2/ Copyright: (C) 1999 - 2010 Apache Software Foundation License: Apache Software License, Version 2.0 dom4j-1.6.1.jar Dom4J (XML Processing Library) URL: http://dom4j.sourceforge.net Copyright: (C) 2001 - 2005 MetaStuff, Ltd. License: Proprietary, included in dom4j-1.6.1.jar ant.jar Apache Ant (build time dependency) URL: http://ant.apache.org/ Copyright: (C) 1999 - 2006 Apache Software Foundation License: Apache Software License, Version 2.0 google-sites-liberation-1.0.3.jar Import/Export tool for Google Sites (build time dependency) URL: http://code.google.com/p/google-sites-liberation/ Copyrigt: (C) 2010 Google License: Apache Software License, Version 2.0 gwt-dev.jar, gwt-user.jar, gwt-servlet.jar Google Web Toolkit 2.1 URL: http://code.google.com/webtoolkit/ Copyrigt: (C) 2010 Google License: Apache Software License, Version 2.0 jsp-api.jar, servlet-api.jar Java API for JSPs and Servlets URL: http://java.sun.com/products/jsp/ Copyrigt: (C) 2006 - 2007 Sun Microsystems, Inc License: Apache Software License, Version 2.0 antlr-2.7.6.jar ANother Tool for Language Recognition (Hibernate dependency, Struts dependency) URL: http://www.antlr.org/ Copyright: (C) 2003-2008, Terence Parr License: BSD, see http://www.antlr.org/license.html backport-util-concurrent.jar Unknown (Hibernate dependency) URL: http://backport-jsr166.sourceforge.net/ Copyright: (C) 2004-2007 Distributed Computing Laboratory, Emory University License: Public Domain, see http://creativecommons.org/licenses/publicdomain/ bsf-2.3.0.jar Bean Scripting Framework (Struts dependency) License: Apache Software License, Version 2.0 commons-beanutils-1.8.0.jar, commons-chain-1.2.jar, commons-configuration-1.6.jar, commons-dbcp-1.4.jar, commons-digester-1.8.jar, commons-fileupload-1.1.1.jar, commons-io-1.1.jar, commons-logging-1.1.1.jar, commons-pool-1.5.4.jar, commons-validator-1.3.1.jar Appache Commons (Hibernate, Struts dependencies) URL: http://commons.apache.org/ Copyright: (C) 2000-2010 The Apache Software Foundation License: Apache Software License, Version 2.0 ehcache-1.5.0.jar Ehcache (Hibernate dependency) URL: http://ehcache.org/ Copyright: (C) 2003-2010 Terracotta, Inc. License: Apache Software License, Version 2.0 hibernate3.jar Hibernate 3.0.5 URL: http://www.hibernate.org/ Copyright: (c) 2008, Adam Warski, JBoss Inc. License: GNU Lesser General Public License, Version 2.1 iText-5.0.2.jar iText is a library that allows you to create and manipulate PDF documents URL: http://itextpdf.com/ Copyright: (C) 2010 1T3XT BVBA License: GNU Affero General Public License, Versin 3 javassist-3.9.0.GA.jar Java Programming Assistant for bytecode manipulation URL: http://www.csg.is.titech.ac.jp/~chiba/javassist/ Copyright: (C) 1999-2010 Shigeru Chiba License: GNU Lesser General Public License jstl-1.0.2.jar JavaServer Pages Standard Tag Library (Struts dependency) URL: https://jstl.dev.java.net/ License: Common Development and Distribution License (CDDL) version 1.0 License: GNU General Public License (GPL) version 2 jta-1.1.jar Java Transaction API (Hibernate dependency) URL: http://www.oracle.com/technetwork/java/javaee/tech/jta-138684.html Copyright: (C) Sun Microsystems, Inc. License: Proprietary Sun's SLA, see https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewLicense-Start log4j-1.2.15.jar Apache Logging Service URL: http://logging.apache.org/log4j/1.2/ Copyright: (C) 1999-2010 Apache Software Foundation License: The Apache Software License, Version 2.0 mail.jar JavaMail API URL: http://www.oracle.com/technetwork/java/index-jsp-139225.html Copyright: Sun Microsystems, Inc. License: Common Development and Distribution License (CDDL) version 1.0 License: GNU General Public License (GPL) version 2 mysql-connector-java-5.1.11-bin.jar MySQL Connector/J Copyright: (C) 2010 Oracle Corp. URL: http://www.mysql.com/products/connector/ License: GNU General Public License (GPL) version 2 org.restlet.ext.net.jar, org.restlet.jar RESTful web framework for Java v2.0.2 URL: http://www.restlet.org/ Copyright: (C) 2005 - 2010 Noelios Technologies License: GNU Lesser General Public License, Version 3.0 oro-2.0.8.jar Text processing Apache Jakarta-ORO (Struts dependency) URL: http://jakarta.apache.org/oro/ Copyright: (C) 1999 - 2004, The Apache Software Foundation License: The Apache Software License, Version 2.0 slf4j-api-1.5.8.jar, slf4j-log4j12-1.5.8.jar Simple Logging Facade for Java (Hibernate dependency) URL: http://www.slf4j.org/ Copyright: (C) 2004-2008 QOS.ch License: Proprietary MIT license, see http://www.slf4j.org/license.html standard-1.0.6.jar Apache Standard Tag Library implementation URL: http://tomcat.apache.org/taglibs/standard/ Copyright: (C) 2001 - 2009 The Apache Software Foundation License: The Apache Software License, Version 2.0 struts-core-1.3.10.jar, struts-el-1.3.10.jar, struts-extras-1.3.10.jar, struts-faces-1.3.10.jar, struts-mailreader-dao-1.3.10.jar, struts-scripting-1.3.10.jar, struts-taglib-1.3.10.jar, struts-tiles-1.3.10.jar Apache Struts URL: http://struts.apache.org/ Copyright: 2000-2008 Apache Software Foundation License: The Apache Software License, Version 2.0 Struts-Layout-1.3.jar Struts Layout URL: http://struts.improve-technologies.com/ Copyright: (C) 2001-2010, Improve SA License: The Apache Software License, Version 2.0 |
|
From: Tomas M. <to...@us...> - 2010-11-11 21:18:24
|
Update of /cvsroot/unitime/UniTime In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv32743 Modified Files: Tag: dev_curriculum build.xml Log Message: Added a list of dependencies, i.e., libraries UniTime needs to run with the appropriate URLs, copyrights, and licenses. Index: build.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/build.xml,v retrieving revision 1.16.2.13 retrieving revision 1.16.2.14 diff -C2 -d -r1.16.2.13 -r1.16.2.14 *** build.xml 11 Nov 2010 00:31:26 -0000 1.16.2.13 --- build.xml 11 Nov 2010 21:18:16 -0000 1.16.2.14 *************** *** 292,296 **** <target name="build-dist" depends="compile-war,help"> <tar destfile="${dist.dir}/unitime-3.2_bld${build.number}.tar"> ! <tarfileset dir="${basedir}/Documentation/License" includes="gpl.txt" fullpath="license/gpl.txt"/> <tarfileset dir="${basedir}/Documentation" includes="ReadMe.txt" fullpath="doc/readme.txt"/> <tarfileset dir="${basedir}/Documentation/Interfaces" includes="*.dtd" prefix="doc/dtd"/> --- 292,296 ---- <target name="build-dist" depends="compile-war,help"> <tar destfile="${dist.dir}/unitime-3.2_bld${build.number}.tar"> ! <tarfileset dir="${basedir}/Documentation/License" includes="*.txt" prefix="license"/> <tarfileset dir="${basedir}/Documentation" includes="ReadMe.txt" fullpath="doc/readme.txt"/> <tarfileset dir="${basedir}/Documentation/Interfaces" includes="*.dtd" prefix="doc/dtd"/> *************** *** 332,336 **** <delete file="${dist.dir}/unitime-3.2_bld${build.number}.tar"/> <zip destfile="${dist.dir}/unitime-3.2_bld${build.number}.zip"> ! <zipfileset dir="${basedir}/Documentation/License" includes="gpl.txt" fullpath="license/gpl.txt"/> <zipfileset dir="${basedir}/Documentation" includes="ReadMe.txt" fullpath="doc/readme.txt"/> <zipfileset dir="${basedir}/Documentation/Interfaces" includes="*.dtd" prefix="doc/dtd"/> --- 332,336 ---- <delete file="${dist.dir}/unitime-3.2_bld${build.number}.tar"/> <zip destfile="${dist.dir}/unitime-3.2_bld${build.number}.zip"> ! <zipfileset dir="${basedir}/Documentation/License" includes="*.txt" prefix="license"/> <zipfileset dir="${basedir}/Documentation" includes="ReadMe.txt" fullpath="doc/readme.txt"/> <zipfileset dir="${basedir}/Documentation/Interfaces" includes="*.dtd" prefix="doc/dtd"/> |
|
From: Tomas M. <to...@us...> - 2010-11-11 19:59:07
|
Update of /cvsroot/unitime/UniTime/WebContent/WEB-INF/lib In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18796/WebContent/WEB-INF/lib Modified Files: Tag: dev_curriculum cpsolver-all-1.2.jar Log Message: CP solver update -- fixed the concurrent modification exception introduced by the last change Index: cpsolver-all-1.2.jar =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/WEB-INF/lib/Attic/cpsolver-all-1.2.jar,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -C2 -d -r1.1.2.10 -r1.1.2.11 Binary files /tmp/cvsEthQXS and /tmp/cvsjK9xzv differ |
|
From: Tomas M. <to...@us...> - 2010-11-11 14:28:17
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/exam In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15463/JavaSource/org/unitime/timetable/solver/exam Modified Files: Tag: dev_curriculum ExamSolverProxy.java ExamSolver.java ExamDatabaseLoader.java Log Message: API changes of the new constraint solver library (mostly Hashtable -> Map changes) + few tiny code cleanups Index: ExamDatabaseLoader.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/exam/ExamDatabaseLoader.java,v retrieving revision 1.49.2.5 retrieving revision 1.49.2.6 diff -C2 -d -r1.49.2.5 -r1.49.2.6 *** ExamDatabaseLoader.java 9 Nov 2010 12:25:50 -0000 1.49.2.5 --- ExamDatabaseLoader.java 11 Nov 2010 14:27:50 -0000 1.49.2.6 *************** *** 20,23 **** --- 20,24 ---- package org.unitime.timetable.solver.exam; + import java.util.ArrayList; import java.util.Collection; import java.util.Date; *************** *** 30,33 **** --- 31,51 ---- import java.util.TreeSet; + import net.sf.cpsolver.coursett.preference.MinMaxPreferenceCombination; + import net.sf.cpsolver.coursett.preference.PreferenceCombination; + import net.sf.cpsolver.coursett.preference.SumPreferenceCombination; + import net.sf.cpsolver.exam.model.Exam; + import net.sf.cpsolver.exam.model.ExamDistributionConstraint; + import net.sf.cpsolver.exam.model.ExamInstructor; + import net.sf.cpsolver.exam.model.ExamOwner; + import net.sf.cpsolver.exam.model.ExamPeriod; + import net.sf.cpsolver.exam.model.ExamPeriodPlacement; + import net.sf.cpsolver.exam.model.ExamPlacement; + import net.sf.cpsolver.exam.model.ExamRoom; + import net.sf.cpsolver.exam.model.ExamRoomPlacement; + import net.sf.cpsolver.exam.model.ExamStudent; + import net.sf.cpsolver.ifs.model.Constraint; + import net.sf.cpsolver.ifs.util.Progress; + import net.sf.cpsolver.ifs.util.ToolBox; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; *************** *** 59,80 **** import org.unitime.timetable.util.RoomAvailability; - import net.sf.cpsolver.coursett.preference.MinMaxPreferenceCombination; - import net.sf.cpsolver.coursett.preference.PreferenceCombination; - import net.sf.cpsolver.coursett.preference.SumPreferenceCombination; - import net.sf.cpsolver.exam.model.Exam; - import net.sf.cpsolver.exam.model.ExamDistributionConstraint; - import net.sf.cpsolver.exam.model.ExamInstructor; - import net.sf.cpsolver.exam.model.ExamOwner; - import net.sf.cpsolver.exam.model.ExamPeriod; - import net.sf.cpsolver.exam.model.ExamPeriodPlacement; - import net.sf.cpsolver.exam.model.ExamPlacement; - import net.sf.cpsolver.exam.model.ExamRoom; - import net.sf.cpsolver.exam.model.ExamRoomPlacement; - import net.sf.cpsolver.exam.model.ExamStudent; - import net.sf.cpsolver.ifs.model.Constraint; - import net.sf.cpsolver.ifs.util.ArrayList; - import net.sf.cpsolver.ifs.util.Progress; - import net.sf.cpsolver.ifs.util.ToolBox; - /** * @author Tomas Muller --- 77,80 ---- Index: ExamSolver.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/exam/ExamSolver.java,v retrieving revision 1.25.2.6 retrieving revision 1.25.2.7 diff -C2 -d -r1.25.2.6 -r1.25.2.7 *** ExamSolver.java 9 Nov 2010 12:25:50 -0000 1.25.2.6 --- ExamSolver.java 11 Nov 2010 14:27:50 -0000 1.25.2.7 *************** *** 26,30 **** import java.util.Collection; import java.util.Date; - import java.util.Enumeration; import java.util.HashSet; import java.util.Hashtable; --- 26,29 ---- *************** *** 67,71 **** import net.sf.cpsolver.ifs.extension.Extension; import net.sf.cpsolver.ifs.model.Constraint; - import net.sf.cpsolver.ifs.model.Value; import net.sf.cpsolver.ifs.solution.Solution; import net.sf.cpsolver.ifs.solver.Solver; --- 66,69 ---- *************** *** 90,95 **** private boolean iIsPassivated = false; private Map iProgressBeforePassivation = null; ! private Hashtable iCurrentSolutionInfoBeforePassivation = null; ! private Hashtable iBestSolutionInfoBeforePassivation = null; private File iPassivationFolder = null; private String iPassivationPuid = null; --- 88,93 ---- private boolean iIsPassivated = false; private Map iProgressBeforePassivation = null; ! private Map<String,String> iCurrentSolutionInfoBeforePassivation = null; ! private Map<String,String> iBestSolutionInfoBeforePassivation = null; private File iPassivationFolder = null; private String iPassivationPuid = null; *************** *** 308,312 **** ! public Hashtable currentSolutionInfo() { if (isPassivated()) return iCurrentSolutionInfoBeforePassivation; synchronized (super.currentSolution()) { --- 306,310 ---- ! public Map<String,String> currentSolutionInfo() { if (isPassivated()) return iCurrentSolutionInfoBeforePassivation; synchronized (super.currentSolution()) { *************** *** 315,319 **** } ! public Hashtable bestSolutionInfo() { if (isPassivated()) return iBestSolutionInfoBeforePassivation; synchronized (super.currentSolution()) { --- 313,317 ---- } ! public Map<String,String> bestSolutionInfo() { if (isPassivated()) return iBestSolutionInfoBeforePassivation; synchronized (super.currentSolution()) { *************** *** 466,470 **** } private void assign(ExamPlacement placement) { ! Hashtable conflictConstraints = currentSolution().getModel().conflictConstraints(placement); if (conflictConstraints.isEmpty()) { placement.variable().assign(0,placement); --- 464,468 ---- } private void assign(ExamPlacement placement) { ! Map<Constraint<Exam,ExamPlacement>, Set<ExamPlacement>> conflictConstraints = currentSolution().getModel().conflictConstraints(placement); if (conflictConstraints.isEmpty()) { placement.variable().assign(0,placement); *************** *** 472,480 **** iProgress.warn("Unable to assign "+placement.variable().getName()+" := "+placement.getName()); iProgress.warn(" Reason:"); ! for (Enumeration ex=conflictConstraints.keys();ex.hasMoreElements();) { ! Constraint c = (Constraint)ex.nextElement(); ! Collection vals = (Collection)conflictConstraints.get(c); ! for (Iterator j=vals.iterator();j.hasNext();) { ! Value v = (Value) j.next(); iProgress.warn(" "+v.variable().getName()+" = "+v.getName()); } --- 470,476 ---- iProgress.warn("Unable to assign "+placement.variable().getName()+" := "+placement.getName()); iProgress.warn(" Reason:"); ! for (Constraint<Exam,ExamPlacement> c: conflictConstraints.keySet()) { ! Set<ExamPlacement> vals = conflictConstraints.get(c); ! for (ExamPlacement v: vals) { iProgress.warn(" "+v.variable().getName()+" = "+v.getName()); } Index: ExamSolverProxy.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/exam/ExamSolverProxy.java,v retrieving revision 1.14.2.2 retrieving revision 1.14.2.3 diff -C2 -d -r1.14.2.2 -r1.14.2.3 *** ExamSolverProxy.java 9 Nov 2010 12:25:50 -0000 1.14.2.2 --- ExamSolverProxy.java 11 Nov 2010 14:27:50 -0000 1.14.2.3 *************** *** 23,27 **** import java.util.Collection; import java.util.Date; - import java.util.Hashtable; import java.util.Map; import java.util.Vector; --- 23,26 ---- *************** *** 57,62 **** public void saveBest(); public void clear(); ! public Hashtable currentSolutionInfo(); ! public Hashtable bestSolutionInfo(); public boolean isWorking(); --- 56,61 ---- public void saveBest(); public void clear(); ! public Map<String,String> currentSolutionInfo(); ! public Map<String,String> bestSolutionInfo(); public boolean isWorking(); |
|
From: Tomas M. <to...@us...> - 2010-11-11 14:28:17
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/studentsct In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15463/JavaSource/org/unitime/timetable/solver/studentsct Modified Files: Tag: dev_curriculum StudentSolver.java StudentSolverProxy.java Log Message: API changes of the new constraint solver library (mostly Hashtable -> Map changes) + few tiny code cleanups Index: StudentSolver.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/studentsct/StudentSolver.java,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** StudentSolver.java 9 Nov 2010 12:25:53 -0000 1.1.2.5 --- StudentSolver.java 11 Nov 2010 14:27:50 -0000 1.1.2.6 *************** *** 24,30 **** import java.io.FileOutputStream; import java.io.IOException; - import java.util.Collection; import java.util.Date; - import java.util.Enumeration; import java.util.HashSet; import java.util.Hashtable; --- 24,28 ---- *************** *** 71,76 **** private boolean iIsPassivated = false; private Map iProgressBeforePassivation = null; ! private Hashtable iCurrentSolutionInfoBeforePassivation = null; ! private Hashtable iBestSolutionInfoBeforePassivation = null; private File iPassivationFolder = null; private String iPassivationPuid = null; --- 69,74 ---- private boolean iIsPassivated = false; private Map iProgressBeforePassivation = null; ! private Map<String, String> iCurrentSolutionInfoBeforePassivation = null; ! private Map<String, String> iBestSolutionInfoBeforePassivation = null; private File iPassivationFolder = null; private String iPassivationPuid = null; *************** *** 171,175 **** } ! public Hashtable currentSolutionInfo() { if (isPassivated()) return iCurrentSolutionInfoBeforePassivation; synchronized (super.currentSolution()) { --- 169,173 ---- } ! public Map<String,String> currentSolutionInfo() { if (isPassivated()) return iCurrentSolutionInfoBeforePassivation; synchronized (super.currentSolution()) { *************** *** 178,182 **** } ! public Hashtable bestSolutionInfo() { if (isPassivated()) return iBestSolutionInfoBeforePassivation; synchronized (super.currentSolution()) { --- 176,180 ---- } ! public Map<String,String> bestSolutionInfo() { if (isPassivated()) return iBestSolutionInfoBeforePassivation; synchronized (super.currentSolution()) { *************** *** 327,331 **** } private void assign(Enrollment enrollment) { ! Hashtable conflictConstraints = currentSolution().getModel().conflictConstraints(enrollment); if (conflictConstraints.isEmpty()) { enrollment.variable().assign(0,enrollment); --- 325,329 ---- } private void assign(Enrollment enrollment) { ! Map<Constraint<Request, Enrollment>, Set<Enrollment>> conflictConstraints = currentSolution().getModel().conflictConstraints(enrollment); if (conflictConstraints.isEmpty()) { enrollment.variable().assign(0,enrollment); *************** *** 333,341 **** iProgress.warn("Unable to assign "+enrollment.variable().getName()+" := "+enrollment.getName()); iProgress.warn(" Reason:"); ! for (Enumeration ex=conflictConstraints.keys();ex.hasMoreElements();) { ! Constraint c = (Constraint)ex.nextElement(); ! Collection vals = (Collection)conflictConstraints.get(c); ! for (Iterator j=vals.iterator();j.hasNext();) { ! Enrollment enrl = (Enrollment) j.next(); iProgress.warn(" "+enrl.getRequest().getName()+" = "+enrl.getName()); } --- 331,337 ---- iProgress.warn("Unable to assign "+enrollment.variable().getName()+" := "+enrollment.getName()); iProgress.warn(" Reason:"); ! for (Constraint<Request, Enrollment> c: conflictConstraints.keySet()) { ! Set<Enrollment> vals = conflictConstraints.get(c); ! for (Enrollment enrl: vals) { iProgress.warn(" "+enrl.getRequest().getName()+" = "+enrl.getName()); } Index: StudentSolverProxy.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/studentsct/StudentSolverProxy.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 *** StudentSolverProxy.java 9 Nov 2010 12:25:53 -0000 1.1.2.2 --- StudentSolverProxy.java 11 Nov 2010 14:27:50 -0000 1.1.2.3 *************** *** 22,26 **** import java.io.File; import java.util.Date; - import java.util.Hashtable; import java.util.Map; --- 22,25 ---- *************** *** 47,52 **** public void saveBest(); public void clear(); ! public Hashtable currentSolutionInfo(); ! public Hashtable bestSolutionInfo(); public boolean isWorking(); --- 46,51 ---- public void saveBest(); public void clear(); ! public Map<String, String> currentSolutionInfo(); ! public Map<String, String> bestSolutionInfo(); public boolean isWorking(); |
|
From: Tomas M. <to...@us...> - 2010-11-11 14:28:16
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/curricula In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15463/JavaSource/org/unitime/timetable/solver/curricula Modified Files: Tag: dev_curriculum CurriculaLastLikeCourseDemands.java Log Message: API changes of the new constraint solver library (mostly Hashtable -> Map changes) + few tiny code cleanups Index: CurriculaLastLikeCourseDemands.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/curricula/Attic/CurriculaLastLikeCourseDemands.java,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -C2 -d -r1.1.2.9 -r1.1.2.10 *** CurriculaLastLikeCourseDemands.java 9 Nov 2010 12:25:50 -0000 1.1.2.9 --- CurriculaLastLikeCourseDemands.java 11 Nov 2010 14:27:51 -0000 1.1.2.10 *************** *** 244,248 **** else { sLog.debug("Unable to assign " + student + " to " + var); ! Hashtable<Constraint<CurVariable, CurValue>, Set<CurValue>> conf = m.conflictConstraints(val); for (Map.Entry<Constraint<CurVariable, CurValue>, Set<CurValue>> entry: conf.entrySet()) { sLog.debug(entry.getKey() + ": " + entry.getValue()); --- 244,248 ---- else { sLog.debug("Unable to assign " + student + " to " + var); ! Map<Constraint<CurVariable, CurValue>, Set<CurValue>> conf = m.conflictConstraints(val); for (Map.Entry<Constraint<CurVariable, CurValue>, Set<CurValue>> entry: conf.entrySet()) { sLog.debug(entry.getKey() + ": " + entry.getValue()); |
|
From: Tomas M. <to...@us...> - 2010-11-11 14:28:16
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/commons/ant In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15463/JavaSource/org/unitime/commons/ant Modified Files: Tag: dev_curriculum WikiGet.java Log Message: API changes of the new constraint solver library (mostly Hashtable -> Map changes) + few tiny code cleanups Index: WikiGet.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/commons/ant/WikiGet.java,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -C2 -d -r1.4.2.2 -r1.4.2.3 *** WikiGet.java 9 Nov 2010 12:25:52 -0000 1.4.2.2 --- WikiGet.java 11 Nov 2010 14:27:51 -0000 1.4.2.3 *************** *** 20,27 **** package org.unitime.commons.ant; ! import java.net.*; ! import java.io.*; import java.text.DecimalFormat; ! import java.util.*; import org.apache.tools.ant.BuildException; --- 20,37 ---- package org.unitime.commons.ant; ! import java.io.BufferedReader; ! import java.io.File; ! import java.io.FileOutputStream; ! import java.io.FileWriter; ! import java.io.IOException; ! import java.io.InputStream; ! import java.io.InputStreamReader; ! import java.io.OutputStream; ! import java.io.PrintWriter; ! import java.net.MalformedURLException; ! import java.net.URL; import java.text.DecimalFormat; ! import java.util.HashSet; ! import java.util.Hashtable; import org.apache.tools.ant.BuildException; |
|
From: Tomas M. <to...@us...> - 2010-11-11 14:27:59
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/dataexchange In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15463/JavaSource/org/unitime/timetable/dataexchange Modified Files: Tag: dev_curriculum CurriculaImport.java Log Message: API changes of the new constraint solver library (mostly Hashtable -> Map changes) + few tiny code cleanups Index: CurriculaImport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/dataexchange/Attic/CurriculaImport.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 *** CurriculaImport.java 9 Nov 2010 12:25:46 -0000 1.1.2.2 --- CurriculaImport.java 11 Nov 2010 14:27:51 -0000 1.1.2.3 *************** *** 20,23 **** --- 20,24 ---- package org.unitime.timetable.dataexchange; + import java.util.ArrayList; import java.util.HashSet; import java.util.Hashtable; *************** *** 26,30 **** import java.util.Map; - import net.sf.cpsolver.ifs.util.ArrayList; import net.sf.cpsolver.ifs.util.ToolBox; --- 27,30 ---- |
|
From: Tomas M. <to...@us...> - 2010-11-11 14:27:59
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15463/JavaSource/org/unitime/timetable/form Modified Files: Tag: dev_curriculum ListSolutionsForm.java Log Message: API changes of the new constraint solver library (mostly Hashtable -> Map changes) + few tiny code cleanups Index: ListSolutionsForm.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/form/ListSolutionsForm.java,v retrieving revision 1.7.2.2 retrieving revision 1.7.2.3 diff -C2 -d -r1.7.2.2 -r1.7.2.3 *** ListSolutionsForm.java 9 Nov 2010 12:25:47 -0000 1.7.2.2 --- ListSolutionsForm.java 11 Nov 2010 14:27:51 -0000 1.7.2.3 *************** *** 21,28 **** import java.text.SimpleDateFormat; ! import java.util.*; import javax.servlet.http.HttpServletRequest; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; --- 21,38 ---- import java.text.SimpleDateFormat; ! import java.util.Collection; ! import java.util.Collections; ! import java.util.Comparator; ! import java.util.Enumeration; ! import java.util.Iterator; ! import java.util.Properties; ! import java.util.Set; ! import java.util.StringTokenizer; ! import java.util.Vector; import javax.servlet.http.HttpServletRequest; + import net.sf.cpsolver.ifs.util.Progress; + import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; *************** *** 48,53 **** import org.unitime.timetable.solver.ui.PropertiesInfo; - import net.sf.cpsolver.ifs.util.Progress; - /** * @author Tomas Muller --- 58,61 ---- |
|
From: Tomas M. <to...@us...> - 2010-11-11 14:27:59
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/reports/exam In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15463/JavaSource/org/unitime/timetable/reports/exam Modified Files: Tag: dev_curriculum PeriodChartReport.java ExamPeriodChartReport.java Log Message: API changes of the new constraint solver library (mostly Hashtable -> Map changes) + few tiny code cleanups Index: ExamPeriodChartReport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/reports/exam/ExamPeriodChartReport.java,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -d -r1.2.2.3 -r1.2.2.4 *** ExamPeriodChartReport.java 9 Nov 2010 12:25:53 -0000 1.2.2.3 --- ExamPeriodChartReport.java 11 Nov 2010 14:27:51 -0000 1.2.2.4 *************** *** 25,28 **** --- 25,29 ---- import java.util.Collection; import java.util.Enumeration; + import java.util.HashMap; import java.util.Hashtable; import java.util.Iterator; *************** *** 31,36 **** import java.util.Vector; - import net.sf.cpsolver.ifs.util.ToolBox; - import org.apache.log4j.Logger; import org.unitime.timetable.model.ExamPeriod; --- 32,35 ---- *************** *** 68,74 **** exams.add(exam); } ! Hashtable<Integer,String> times = new Hashtable(); ! Hashtable<Integer,String> fixedTimes = new Hashtable(); ! Hashtable<Integer,String> days = new Hashtable(); for (Iterator i=ExamPeriod.findAll(getSession().getUniqueId(), getExamType()).iterator();i.hasNext();) { ExamPeriod period = (ExamPeriod)i.next(); --- 67,73 ---- exams.add(exam); } ! HashMap<Integer,String> times = new HashMap<Integer, String>(); ! HashMap<Integer,String> fixedTimes = new HashMap<Integer, String>(); ! HashMap<Integer,String> days = new HashMap<Integer, String>(); for (Iterator i=ExamPeriod.findAll(getSession().getUniqueId(), getExamType()).iterator();i.hasNext();) { ExamPeriod period = (ExamPeriod)i.next(); *************** *** 92,99 **** boolean firstLine = true; for (int dIdx = 0; dIdx < days.size(); dIdx+=nrCols) { ! for (Enumeration e=ToolBox.sortEnumeration(times.keys());e.hasMoreElements();) { ! int time = ((Integer)e.nextElement()).intValue(); int offset = 0; ! String timeStr = (String)times.get(new Integer(time)); String header1 = ""; String header2 = ""; --- 91,97 ---- boolean firstLine = true; for (int dIdx = 0; dIdx < days.size(); dIdx+=nrCols) { ! for (Integer time: new TreeSet<Integer>(times.keySet())) { int offset = 0; ! String timeStr = times.get(time); String header1 = ""; String header2 = ""; *************** *** 104,109 **** String lastDay = null; nrCols = 0; ! for (Enumeration f=ToolBox.sortEnumeration(days.keys());f.hasMoreElements();idx++) { ! int day = ((Integer)f.nextElement()).intValue(); String dayStr = days.get(day); if (idx<dIdx || (firstDay!=null && (dayStr.startsWith("Mon") || day>=firstDayOffset+7)) || nrCols==(iTotals?6:5)) continue; --- 102,107 ---- String lastDay = null; nrCols = 0; ! for (Iterator<Integer> f = new TreeSet<Integer>(days.keySet()).iterator(); f.hasNext(); idx++) { ! int day = f.next(); String dayStr = days.get(day); if (idx<dIdx || (firstDay!=null && (dayStr.startsWith("Mon") || day>=firstDayOffset+7)) || nrCols==(iTotals?6:5)) continue; *************** *** 282,287 **** String line1 = "", line2 = "", line3 = ""; int idx = 0; ! for (Enumeration f=ToolBox.sortEnumeration(days.keys());f.hasMoreElements();idx++) { ! Integer day = (Integer)f.nextElement(); if (idx<dIdx || idx>=dIdx+nrCols) continue; line1 += mpad((String)days.get(day),20)+" "; --- 280,285 ---- String line1 = "", line2 = "", line3 = ""; int idx = 0; ! for (Iterator<Integer> f = new TreeSet<Integer>(days.keySet()).iterator(); f.hasNext(); idx++) { ! int day = f.next(); if (idx<dIdx || idx>=dIdx+nrCols) continue; line1 += mpad((String)days.get(day),20)+" "; Index: PeriodChartReport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/reports/exam/PeriodChartReport.java,v retrieving revision 1.17.2.3 retrieving revision 1.17.2.4 diff -C2 -d -r1.17.2.3 -r1.17.2.4 *** PeriodChartReport.java 9 Nov 2010 12:25:53 -0000 1.17.2.3 --- PeriodChartReport.java 11 Nov 2010 14:27:51 -0000 1.17.2.4 *************** *** 25,28 **** --- 25,29 ---- import java.util.Collection; import java.util.Enumeration; + import java.util.HashMap; import java.util.Hashtable; import java.util.Iterator; *************** *** 31,36 **** import java.util.Vector; - import net.sf.cpsolver.ifs.util.ToolBox; - import org.apache.log4j.Logger; import org.unitime.timetable.model.ExamPeriod; --- 32,35 ---- *************** *** 71,77 **** } } ! Hashtable<Integer,String> times = new Hashtable(); ! Hashtable<Integer,String> fixedTimes = new Hashtable(); ! Hashtable<Integer,String> days = new Hashtable(); for (Iterator i=ExamPeriod.findAll(getSession().getUniqueId(), getExamType()).iterator();i.hasNext();) { ExamPeriod period = (ExamPeriod)i.next(); --- 70,76 ---- } } ! HashMap<Integer,String> times = new HashMap<Integer, String>(); ! HashMap<Integer,String> fixedTimes = new HashMap<Integer, String>(); ! HashMap<Integer,String> days = new HashMap<Integer, String>(); for (Iterator i=ExamPeriod.findAll(getSession().getUniqueId(), getExamType()).iterator();i.hasNext();) { ExamPeriod period = (ExamPeriod)i.next(); *************** *** 95,102 **** boolean firstLine = true; for (int dIdx = 0; dIdx < days.size(); dIdx+=nrCols) { ! for (Enumeration e=ToolBox.sortEnumeration(times.keys());e.hasMoreElements();) { ! int time = ((Integer)e.nextElement()).intValue(); int offset = 0; ! String timeStr = (String)times.get(new Integer(time)); String header1 = ""; String header2 = ""; --- 94,100 ---- boolean firstLine = true; for (int dIdx = 0; dIdx < days.size(); dIdx+=nrCols) { ! for (Integer time: new TreeSet<Integer>(times.keySet())) { int offset = 0; ! String timeStr = times.get(time); String header1 = ""; String header2 = ""; *************** *** 107,112 **** String lastDay = null; nrCols = 0; ! for (Enumeration f=ToolBox.sortEnumeration(days.keys());f.hasMoreElements();idx++) { ! int day = ((Integer)f.nextElement()).intValue(); String dayStr = days.get(day); if (idx<dIdx || (firstDay!=null && (dayStr.startsWith("Mon") || day>=firstDayOffset+7)) || nrCols==(iTotals?6:5)) continue; --- 105,110 ---- String lastDay = null; nrCols = 0; ! for (Iterator<Integer> f = new TreeSet<Integer>(days.keySet()).iterator();f.hasNext();idx++) { ! Integer day = f.next(); String dayStr = days.get(day); if (idx<dIdx || (firstDay!=null && (dayStr.startsWith("Mon") || day>=firstDayOffset+7)) || nrCols==(iTotals?6:5)) continue; *************** *** 272,277 **** String line1 = "", line2 = "", line3 = ""; int idx = 0; ! for (Enumeration f=ToolBox.sortEnumeration(days.keys());f.hasMoreElements();idx++) { ! Integer day = (Integer)f.nextElement(); if (idx<dIdx || idx>=dIdx+nrCols) continue; line1 += mpad((String)days.get(day),20)+" "; --- 270,275 ---- String line1 = "", line2 = "", line3 = ""; int idx = 0; ! for (Iterator<Integer> f = new TreeSet<Integer>(days.keySet()).iterator(); f.hasNext(); idx++) { ! Integer day = f.next(); if (idx<dIdx || idx>=dIdx+nrCols) continue; line1 += mpad((String)days.get(day),20)+" "; |
