Menu
▾
▴
[UniTime-cvs] UniTime/JavaSource/org/unitime/timetable/solver/curricula CurriculaCourseDemands.java, 1.1.2.11, 1.1.2.12 StudentCourseRequests.java, 1.1.2.2, 1.1.2.3 ProjectedStudentCourseDemands.java, 1.1.2.5, 1.1.2.6 CurriculaLastLikeCourseDemands.java, 1.1.2.8, 1.1.2.9 StudentCourseDemands.java, 1.1.2.6, 1.1.2.7 EnrolledStudentCourseDemands.java, 1.1.2.4, 1.1.2.5 LastLikeStudentCourseDemands.java, 1.1.2.6, 1.1.2.7 WeightedLastLikeStudentCourseDemands.java, 1.1.2.1, 1.1.2.2
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/curricula In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv9885/JavaSource/org/unitime/timetable/solver/curricula Modified Files: Tag: dev_curriculum CurriculaCourseDemands.java StudentCourseRequests.java ProjectedStudentCourseDemands.java CurriculaLastLikeCourseDemands.java StudentCourseDemands.java EnrolledStudentCourseDemands.java LastLikeStudentCourseDemands.java WeightedLastLikeStudentCourseDemands.java Log Message: License changed to GNU GPL version 3 (was version 2). Index: LastLikeStudentCourseDemands.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/curricula/Attic/LastLikeStudentCourseDemands.java,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -C2 -d -r1.1.2.6 -r1.1.2.7 *** LastLikeStudentCourseDemands.java 23 Sep 2010 12:02:11 -0000 1.1.2.6 --- LastLikeStudentCourseDemands.java 9 Nov 2010 12:25:50 -0000 1.1.2.7 *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.curricula; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.curricula; *************** *** 33,36 **** --- 33,39 ---- import net.sf.cpsolver.ifs.util.Progress; + /** + * @author Tomas Muller + */ public class LastLikeStudentCourseDemands implements StudentCourseDemands { protected org.hibernate.Session iHibSession; Index: ProjectedStudentCourseDemands.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/curricula/Attic/ProjectedStudentCourseDemands.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 *** ProjectedStudentCourseDemands.java 21 Sep 2010 16:10:38 -0000 1.1.2.5 --- ProjectedStudentCourseDemands.java 9 Nov 2010 12:25:50 -0000 1.1.2.6 *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.curricula; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.curricula; *************** *** 34,37 **** --- 34,40 ---- import org.unitime.timetable.model.SubjectArea; + /** + * @author Tomas Muller + */ public class ProjectedStudentCourseDemands extends LastLikeStudentCourseDemands { private Hashtable<String,Hashtable<String,Hashtable<String, Float>>> iAreaClasfMajor2Proj = new Hashtable<String, Hashtable<String,Hashtable<String,Float>>>(); Index: CurriculaLastLikeCourseDemands.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/curricula/Attic/CurriculaLastLikeCourseDemands.java,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -C2 -d -r1.1.2.8 -r1.1.2.9 *** CurriculaLastLikeCourseDemands.java 27 Sep 2010 17:45:19 -0000 1.1.2.8 --- CurriculaLastLikeCourseDemands.java 9 Nov 2010 12:25:50 -0000 1.1.2.9 *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.curricula; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.curricula; *************** *** 51,54 **** --- 51,57 ---- import org.unitime.timetable.solver.curricula.students.CurVariable; + /** + * @author Tomas Muller + */ public class CurriculaLastLikeCourseDemands implements StudentCourseDemands { private static Log sLog = LogFactory.getLog(CurriculaLastLikeCourseDemands.class); Index: StudentCourseDemands.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/curricula/Attic/StudentCourseDemands.java,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -C2 -d -r1.1.2.6 -r1.1.2.7 *** StudentCourseDemands.java 27 Sep 2010 17:36:27 -0000 1.1.2.6 --- StudentCourseDemands.java 9 Nov 2010 12:25:50 -0000 1.1.2.7 *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.curricula; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.curricula; *************** *** 31,34 **** --- 31,37 ---- import org.unitime.timetable.model.dao.CourseOfferingDAO; + /** + * @author Tomas Muller + */ public interface StudentCourseDemands { /** Index: WeightedLastLikeStudentCourseDemands.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/curricula/Attic/WeightedLastLikeStudentCourseDemands.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** WeightedLastLikeStudentCourseDemands.java 30 Jul 2010 18:23:06 -0000 1.1.2.1 --- WeightedLastLikeStudentCourseDemands.java 9 Nov 2010 12:25:50 -0000 1.1.2.2 *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.curricula; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.curricula; *************** *** 22,25 **** --- 22,28 ---- import net.sf.cpsolver.ifs.util.DataProperties; + /** + * @author Tomas Muller + */ public class WeightedLastLikeStudentCourseDemands extends LastLikeStudentCourseDemands { Index: EnrolledStudentCourseDemands.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/curricula/Attic/EnrolledStudentCourseDemands.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 *** EnrolledStudentCourseDemands.java 23 Sep 2010 12:02:11 -0000 1.1.2.4 --- EnrolledStudentCourseDemands.java 9 Nov 2010 12:25:50 -0000 1.1.2.5 *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.curricula; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.curricula; *************** *** 32,35 **** --- 32,38 ---- import net.sf.cpsolver.ifs.util.Progress; + /** + * @author Tomas Muller + */ public class EnrolledStudentCourseDemands implements StudentCourseDemands { private org.hibernate.Session iHibSession = null; Index: StudentCourseRequests.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/curricula/Attic/StudentCourseRequests.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 *** StudentCourseRequests.java 27 Sep 2010 17:36:14 -0000 1.1.2.2 --- StudentCourseRequests.java 9 Nov 2010 12:25:50 -0000 1.1.2.3 *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.curricula; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.curricula; *************** *** 33,36 **** --- 33,39 ---- import org.unitime.timetable.model.SubjectArea; + /** + * @author Tomas Muller + */ public class StudentCourseRequests implements StudentCourseDemands { protected Hashtable<Long, Hashtable<Long, Set<WeightedStudentId>>> iDemands = new Hashtable<Long, Hashtable<Long, Set<WeightedStudentId>>>(); Index: CurriculaCourseDemands.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/curricula/Attic/CurriculaCourseDemands.java,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -C2 -d -r1.1.2.11 -r1.1.2.12 *** CurriculaCourseDemands.java 27 Sep 2010 17:37:40 -0000 1.1.2.11 --- CurriculaCourseDemands.java 9 Nov 2010 12:25:50 -0000 1.1.2.12 *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.timetable.solver.curricula; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.timetable.solver.curricula; *************** *** 46,49 **** --- 46,52 ---- import net.sf.cpsolver.ifs.util.Progress; + /** + * @author Tomas Muller + */ public class CurriculaCourseDemands implements StudentCourseDemands { private static Log sLog = LogFactory.getLog(CurriculaCourseDemands.class); |
