1435 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stefan Schroeder	82899edc97	some json stuff	2014-11-07 12:20:54 +01:00
Stefan Schroeder	99d8cbed69	some adaptations referring to time scheduling experiments	2014-11-06 20:45:44 +01:00
Stefan Schroeder	dcfba5463d	add property to go ahead if maven failed to build java-docs	2014-11-06 11:26:01 +01:00
Stefan Schroeder	b9c15a20fc	fix adding end twice	2014-11-06 10:28:57 +01:00
oblonski	b2bbec1103	add json stuff	2014-11-05 17:27:09 +01:00
oblonski	245e74a749	Merge branch 'master' into json	2014-11-05 17:07:45 +01:00
oblonski	1fb7c0229c	makes considering Skills default	2014-11-05 17:06:46 +01:00
oblonski	d923859768	add json stuff	2014-11-05 17:03:49 +01:00
oblonski	bec373ba94	add json stuff	2014-11-05 13:54:00 +01:00
oblonski	67b8ef5a9a	add json stuff	2014-11-05 07:39:29 +01:00
oblonski	bf4b01e681	add json stuff	2014-11-05 06:54:35 +01:00
oblonski	025316b5a8	add json stuff	2014-11-05 06:48:47 +01:00
oblonski	a32ccf3efa	add json stuff	2014-11-05 06:39:00 +01:00
oblonski	a55be49735	add json stuff	2014-11-05 06:33:39 +01:00
oblonski	ed1361482e	add json stuff	2014-11-05 06:32:28 +01:00
oblonski	b4ae11631b	Merge branch 'master' into json	2014-11-04 21:56:11 +01:00
oblonski	75ef5f245d	refine Service.toString()	2014-11-04 21:54:19 +01:00
oblonski	382d2d850f	json io stuff	2014-11-04 21:50:44 +01:00
oblonski	27d3a8dcb6	Merge branch 'master' into json	2014-11-04 16:29:34 +01:00
oblonski	fbc69fd80e	refine VehicleImpl.toString() and Skills.toString()	2014-11-04 16:28:39 +01:00
oblonski	b04d5d8bdc	add jsonReader	2014-11-04 16:23:14 +01:00
oblonski	86d4e60b96	Merge branch 'master' into json	2014-11-04 16:19:45 +01:00
oblonski	d07a2766cd	Merge remote-tracking branch 'origin/master'	2014-11-04 16:18:58 +01:00
oblonski	1022f40e26	refine VehicleImpl.toString() and VehicleTypeImpl.toString()	2014-11-04 16:18:23 +01:00
oblonski	69951579a2	add JsonReader	2014-11-04 16:13:01 +01:00
oblonski	26c42e83ae	add JsonReader	2014-11-04 12:50:29 +01:00
oblonski	8ce3c4c2da	make JsonWriter write vehicleTypes	2014-11-04 12:09:02 +01:00
oblonski	93dc0f69e6	make JsonWriter write vehicles	2014-11-03 23:22:42 +01:00
Stefan Schroeder	b1eb836ec3	import jackson	2014-11-03 20:55:10 +01:00
Stefan Schroeder	7a7ce8a604	add json-writer and constants	2014-11-03 20:54:53 +01:00
jsprit	c14534da91	Update WHATS_NEW.md	2014-10-14 21:21:17 +02:00
jsprit	2e7e9514af	Update WHATS_NEW.md	2014-10-14 16:16:30 +02:00
jsprit	ba91e57cac	Update CHANGELOG.md	2014-10-14 11:07:38 +02:00
jsprit	f8f5b22aea	Update WHATS_NEW.md	2014-10-14 11:06:14 +02:00
jsprit	7450b74a4a	Update WHATS_NEW.md	2014-10-14 11:05:29 +02:00
jsprit	c51fa49127	Update WHATS_NEW.md	2014-10-14 11:01:19 +02:00
jsprit	f293e0ac04	Update WHATS_NEW.md	2014-10-14 10:59:40 +02:00
jsprit	8a8e5277b1	Update WHATS_NEW.md	2014-10-14 10:58:54 +02:00
oblonski	0f3265012e	[maven-release-plugin] prepare for next development iteration	2014-10-14 10:40:18 +02:00
oblonski	0b1ddd528e	[maven-release-plugin] prepare release v1.4.2	2014-10-14 10:38:55 +02:00
oblonski	9aafc84c12	modify example	2014-10-13 19:10:58 +02:00
oblonski	83cc5ef1fc	replace IllegalStateException with IllegalArgumentException	2014-10-08 10:07:55 +02:00
oblonski	0815e68bbc	add javadoc	2014-10-08 10:04:29 +02:00
oblonski	0cf6384866	add, test and illustrate more load/activity indicators	2014-10-08 09:57:28 +02:00
oblonski	682c0b5083	add solution stats	2014-10-07 15:29:22 +02:00
oblonski	6d7087f8ca	Merge remote-tracking branch 'origin/master'	2014-10-07 12:58:18 +02:00
oblonski	04b52759e5	add and test skill constraint violation checks	2014-10-07 12:54:58 +02:00
oblonski	c788b477b6	add and test skill constraint violation checks	2014-10-07 08:52:59 +02:00
oblonski	47d859652a	add and test constraint violation checks	2014-10-06 16:48:49 +02:00
oblonski	f733587b2b	add and test removeActivity(act) and hasActivity(act) in TourActivities	2014-10-06 16:47:58 +02:00