CPsolver: upgrade to 1.3.87

Course Timetabling: Back-to-Back
- avoid issues (especially ArrayIndexOutOfBoundsException) when classes that are in a back-to-back constraint can partially overlap in time

Course Timetabling: Max N Hours A Day
- conflict checking for the Max N Hours A Day group constraint corrected: do not return a constant variable (i.e., a committed class of some other problem) as a conflict
  - also, return the evaluated placement as a conflict when there is not enough time on the day for the class without unassigning a constant variable

Batch Student Scheduling: Request Groups
- improved ability to keep students of the same request group together by shuffling students of a request group that are spread over multiple sections into a single section or into a fewer number of sections

.classpath

@@ -15,7 +15,7 @@
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-logging-1.0.4.jar" sourcepath="3rd_party/sources/commons-logging-1.0.4-sources.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-pool-1.5.4.jar" sourcepath="3rd_party/sources/commons-pool-1.5.4-sources.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-validator-1.3.1.jar" sourcepath="3rd_party/sources/commons-validator-1.3.1-sources.jar"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/cpsolver-1.3.79.jar" sourcepath="3rd_party/sources/cpsolver-1.3.79-sources.jar"/>
+	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/cpsolver-1.3.87.jar" sourcepath="3rd_party/sources/cpsolver-1.3.87-sources.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/dom4j-1.6.1.jar" sourcepath="3rd_party/sources/dom4j-1.6.1-sources.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/itext-2.1.7.jar" sourcepath="3rd_party/sources/itext-2.1.7-sources.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/org.restlet-2.3.4.jar" sourcepath="3rd_party/sources/org.restlet-2.3.4-sources.jar"/>

NOTICE

@@ -372,7 +372,7 @@ spring-security-web (spring-security-web-3.2.8.RELEASE.jar)
 	under Apache Software License (ASL), Version 2.0
 	http://spring.io/spring-security
 
-CPSolver (cpsolver-1.3.79.jar)
+CPSolver (cpsolver-1.3.87.jar)
 	under GNU Lesser General Public License (LGPL), Version 3
 	http://www.cpsolver.org
 

WebContent/help/Release-Notes.xml

@@ -40,6 +40,28 @@
 				<line>Update the class event name when the controlling course of the class has changed.</line>
 			</description>
 		</item>
+		<item>
+			<name>Back-to-Back Distribution Preference</name>
+			<description>
+				<line>Avoid issues (especially ArrayIndexOutOfBoundsException) when classes that are in a back-to-back constraint can partially overlap in time.</line>
+			</description>
+		</item>
+		<item>
+			<name>Max N Hours A Day Distribution Preference</name>
+			<description>
+				<line>Conflict checking for the Max N Hours A Day group constraint corrected: do not return a constant variable (i.e., a committed class of some other problem) as a conflict.</line>
+				<line>Also, return the evaluated placement as a conflict when there is not enough time on the day for the class without unassigning a constant variable.</line>
+			</description>
+		</item>
+	</category>
+	<category>
+		<title>Batch Student Scheduling</title>
+		<item>
+			<name>Request Groups</name>
+			<description>
+				<line>Improved ability to keep students of the same request group together by shuffling students of a request group that are spread over multiple sections into a single section or into a fewer number of sections.</line>
+			</description>
+		</item>
 	</category>
 </release>
 

build.xml

@@ -131,7 +131,7 @@
 			</fileset>
 			<manifest>
 				<attribute name="Main-Class" value="org.unitime.timetable.solver.jgroups.SolverServerImplementation" />
-				<attribute name="Class-Path" value="antlr-2.7.7.jar biweekly-0.4.3.jar commons-dbcp-1.4.jar commons-logging-1.0.4.jar commons-pool-1.5.4.jar cpsolver-1.3.79.jar dom4j-1.6.1.jar ehcache-core-2.6.11.jar ehcache-jgroupsreplication-1.7.jar freemarker-2.3.23.jar gson-2.3.1.jar gwt-servlet-2.7.0.jar hibernate-commons-annotations-4.0.5.Final.jar hibernate-core-4.3.11.Final.jar hibernate-ehcache-4.3.11.Final.jar hibernate-infinispan-4.3.11.Final.jar hibernate-jpa-2.1-api-1.0.0.Final.jar infinispan-commons-7.2.5.Final.jar infinispan-core-7.2.5.Final.jar jackson-core-2.6.1.jar javassist-3.18.2-GA.jar javax.servlet-api-3.0.1.jar jboss-logging-3.1.3.GA.jar jboss-marshalling-osgi-1.4.10.Final.jar jboss-transaction-api_1.2_spec-1.0.0.Final.jar jbossjta-4.16.6.Final.jar jgroups-3.6.6.Final.jar joda-time-2.8.2.jar jsp-api-2.2.jar log4j-1.2.17.jar mail-1.4.7.jar mysql-connector-java-5.1.36.jar ojdbc7-12.1.0.2.jar org.restlet-2.3.4.jar protobuf-java-2.6.1.jar slf4j-api-1.7.12.jar slf4j-log4j12-1.7.12.jar spring-core-3.2.14.RELEASE.jar spring-security-core-3.2.8.RELEASE.jar spring-web-3.2.14.RELEASE.jar" />
+				<attribute name="Class-Path" value="antlr-2.7.7.jar biweekly-0.4.3.jar commons-dbcp-1.4.jar commons-logging-1.0.4.jar commons-pool-1.5.4.jar cpsolver-1.3.87.jar dom4j-1.6.1.jar ehcache-core-2.6.11.jar ehcache-jgroupsreplication-1.7.jar freemarker-2.3.23.jar gson-2.3.1.jar gwt-servlet-2.7.0.jar hibernate-commons-annotations-4.0.5.Final.jar hibernate-core-4.3.11.Final.jar hibernate-ehcache-4.3.11.Final.jar hibernate-infinispan-4.3.11.Final.jar hibernate-jpa-2.1-api-1.0.0.Final.jar infinispan-commons-7.2.5.Final.jar infinispan-core-7.2.5.Final.jar jackson-core-2.6.1.jar javassist-3.18.2-GA.jar javax.servlet-api-3.0.1.jar jboss-logging-3.1.3.GA.jar jboss-marshalling-osgi-1.4.10.Final.jar jboss-transaction-api_1.2_spec-1.0.0.Final.jar jbossjta-4.16.6.Final.jar jgroups-3.6.6.Final.jar joda-time-2.8.2.jar jsp-api-2.2.jar log4j-1.2.17.jar mail-1.4.7.jar mysql-connector-java-5.1.36.jar ojdbc7-12.1.0.2.jar org.restlet-2.3.4.jar protobuf-java-2.6.1.jar slf4j-api-1.7.12.jar slf4j-log4j12-1.7.12.jar spring-core-3.2.14.RELEASE.jar spring-security-core-3.2.8.RELEASE.jar spring-web-3.2.14.RELEASE.jar" />
 				<attribute name="Timetabling-Version" value="4.1_bld${build.number}"/>
 			</manifest>
 		</jar>
@@ -303,7 +303,7 @@
 				<include name="commons-dbcp-1.4.jar"/>
 				<include name="commons-logging-1.0.4.jar"/>
 				<include name="commons-pool-1.5.4.jar"/>
-				<include name="cpsolver-1.3.79.jar"/>
+				<include name="cpsolver-1.3.87.jar"/>
 				<include name="dom4j-1.6.1.jar"/>
 				<include name="ehcache-core-2.6.11.jar"/>
 				<include name="ehcache-jgroupsreplication-1.7.jar"/>
@@ -362,7 +362,7 @@
 				<include name="commons-dbcp-1.4.jar"/>
 				<include name="commons-logging-1.0.4.jar"/>
 				<include name="commons-pool-1.5.4.jar"/>
-				<include name="cpsolver-1.3.79.jar"/>
+				<include name="cpsolver-1.3.87.jar"/>
 				<include name="dom4j-1.6.1.jar"/>
 				<include name="ehcache-core-2.6.11.jar"/>
 				<include name="ehcache-jgroupsreplication-1.7.jar"/>

pom.xml

@@ -744,7 +744,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<cpsolver.version>1.3.79</cpsolver.version>
+		<cpsolver.version>1.3.87</cpsolver.version>
 		<hibernate.version>4.3.11.Final</hibernate.version>
 		<itext.version>2.1.7</itext.version>
 		<struts.version>1.3.10</struts.version>