Split (1)

train · ~168M rows (showing the first 247k)

repo string	commit string	message string	diff string
devnev/skyways	a55ab686460f28487e2e677e2f955bccda771635	Rewrote build system to use per-dir makefiles.	diff --git a/Config.mk.in b/Config.mk.in new file mode 100644 index 0000000..495edce --- /dev/null +++ b/Config.mk.in @@ -0,0 +1,34 @@ +#!/usr/bin/make -f +# @configure_input@ + +$(if $(MK_INCLUDE),,$(error This makefile is meant for inclusion by other makefiles)) + +prefix=@prefix@ +datarootdir=@datarootdir@ +datadir=...
devnev/skyways	7fcb93946db4236c372161b4e3f912969f62bab8	Added support for compile-time relocatable data directory.	diff --git a/Makefile.in b/Makefile.in index 74cb70a..a1779c7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,207 +1,214 @@ #!/usr/bin/make # @configure_input@ ###################################### # configuration: change things here. # ###################################### +prefix=@prefix@ +datarootdir=@da...
devnev/skyways	25263a9aca586a0a33a71fb8d2d43d4e3d7815e4	Fixed vpath woes.	diff --git a/Makefile.in b/Makefile.in index 1dc25d0..74cb70a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,205 +1,207 @@ #!/usr/bin/make # @configure_input@ ###################################### # configuration: change things here. # ###################################### PROGRAMS?=@programs@ SkywaysG...
devnev/skyways	29556fe0609b777cbec262b7c4b6e836182b75b3	Made ship model configurable from command-line.	diff --git a/src/backends/configparser.cpp b/src/backends/configparser.cpp index a0ee0ce..b5eee32 100644 --- a/src/backends/configparser.cpp +++ b/src/backends/configparser.cpp @@ -1,47 +1,51 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you ...
devnev/skyways	422c2f73296a3a9fc05507ae0fd08d99db2e888d	Moved loading ship model into configuration.	diff --git a/src/configuration.cpp b/src/configuration.cpp index 878f826..3000a16 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -1,44 +1,64 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // m...
devnev/skyways	dbb4ab2e5d2c486438dd17e30d3237cfd5ae7aa3	Moved creation of ship object out of game class.	diff --git a/src/configuration.cpp b/src/configuration.cpp index de22c3d..878f826 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -1,42 +1,44 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // m...
devnev/skyways	6e59e9f2340e36e075d376569d54e0da209ab4cc	Reduced minimum boost version to 1.34.0.	diff --git a/configure.ac b/configure.ac index 6fa7216..079ce94 100644 --- a/configure.ac +++ b/configure.ac @@ -1,111 +1,111 @@ # -- Autoconf -- # vim: ft=m4 # Process this file with autoconf to produce a configure script....
devnev/skyways	e1806a0b40b842b5500a10489a7fb23dc39b719c	Added simple distcheck target.	diff --git a/Makefile.in b/Makefile.in index 3f6b8f8..1dc25d0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,198 +1,205 @@ #!/usr/bin/make # @configure_input@ ###################################### # configuration: change things here. # ###################################### PROGRAMS?=@programs@ SkywaysG...
devnev/skyways	13386d63555a60205c882446c447428a86f1b429	Fixed incorrect include.	diff --git a/src/world/ship.hpp b/src/world/ship.hpp index 060c586..907bf37 100644 --- a/src/world/ship.hpp +++ b/src/world/ship.hpp @@ -1,60 +1,60 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it und...
devnev/skyways	6c261972f6ed462cc74bb74bd088e07aaca35718	Added support for "parallel" builds.	diff --git a/Makefile.in b/Makefile.in index 95403e8..3f6b8f8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,190 +1,198 @@ #!/usr/bin/make # @configure_input@ ###################################### # configuration: change things here. # ###################################### PROGRAMS?=@programs@ SkywaysG...
devnev/skyways	2b24c318b53c848fb055f560893810364ef9fefb	Added various clean rules to Makefile.	diff --git a/Makefile.in b/Makefile.in index be2707d..95403e8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,177 +1,190 @@ #!/usr/bin/make # @configure_input@ ###################################### # configuration: change things here. # ###################################### PROGRAMS?=@programs@ SkywaysG...
devnev/skyways	519dd80e4292a580a461d7e322d7f6c88b3de1d4	Added make target "dist".	diff --git a/Makefile.in b/Makefile.in index 5c6f952..be2707d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,163 +1,177 @@ #!/usr/bin/make # @configure_input@ ###################################### # configuration: change things here. # ###################################### PROGRAMS?=@programs@ SkywaysG...
devnev/skyways	90f92ff5c4c43712e1257dc5c66720cfc257a2fc	Fixed build files to detect Boost using autoconf.	diff --git a/Makefile.in b/Makefile.in index bc22738..5c6f952 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,163 +1,163 @@ #!/usr/bin/make # @configure_input@ ###################################### # configuration: change things here. # ###################################### PROGRAMS?=@programs@ SkywaysG...
devnev/skyways	380099b2720b4b928f69b0d6d1ca08fd5c0585a0	Added configuration status output to end of configure.ac.	diff --git a/configure.ac b/configure.ac index ba681c2..bd31d8e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,106 +1,111 @@ # -- Autoconf -- # vim: ft=m4 # Process this file with autoconf to produce a configure script....
devnev/skyways	d77cfd908510a43f1e7b21d532b8adcd75a603fd	Various minor correctness and portability fixes to Makefile.in.	diff --git a/Makefile.in b/Makefile.in index 29bf3f6..bc22738 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,158 +1,163 @@ #!/usr/bin/make +# @configure_input@ + ###################################### # configuration: change things here. # ###################################### PROGRAMS?=@programs@ SkywaysG...
devnev/skyways	65d092546f59ab482e2503130340240a0f8ddd0c	Added check that something will be built to configure.ac.	diff --git a/configure.ac b/configure.ac index e9f33ee..ba681c2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,101 +1,106 @@ # -- Autoconf -- # vim: ft=m4 # Process this file with autoconf to produce a configure script....
devnev/skyways	0e000681afddbac7a6b902474eead774ba303595	Fixed unadjusted AC_INIT parameters.	diff --git a/configure.ac b/configure.ac index e2eed54..e9f33ee 100644 --- a/configure.ac +++ b/configure.ac @@ -1,101 +1,101 @@ # -- Autoconf -- # vim: ft=m4 # Process this file with autoconf to produce a configure script....
devnev/skyways	76f483bb7361a48fe2d579cba11f73186239a079	Added autoconf output to .gitignore.	diff --git a/.gitignore b/.gitignore index 616b08a..04868c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,14 @@ .o .d skyways.glut skyways.qt skyways.sdl moc_*.cpp +Makefile +aclocal.m4 +autom4te.cache/ +config.h +config.h.in +config.log +config.status +configure
devnev/skyways	5f27d3a986ce5f78cedf97086a6e47fee66a4b0e	Applied autoconf compile/link flag substitutions to Makefile.	diff --git a/Makefile.in b/Makefile.in index a2f7db7..29bf3f6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,158 +1,158 @@ #!/usr/bin/make ###################################### # configuration: change things here. # ###################################### PROGRAMS?=@programs@ SkywaysGlut_BINARY=skyways.glut...
devnev/skyways	afb8d0935ce65807f0df7c635cd29d00eafbb463	Changed build to use autoconf.	diff --git a/Makefile b/Makefile.in similarity index 99% rename from Makefile rename to Makefile.in index c849b74..a2f7db7 100644 --- a/Makefile +++ b/Makefile.in @@ -1,158 +1,158 @@ #!/usr/bin/make ###################################### # configuration: change things here. # ###################################### ...
devnev/skyways	bff939fa6a7647b1e3963414dfefb062c70643ca	Improved Makefile.	diff --git a/Makefile b/Makefile index a3e1e66..c849b74 100644 --- a/Makefile +++ b/Makefile @@ -1,157 +1,158 @@ #!/usr/bin/make ###################################### # configuration: change things here. # ###################################### PROGRAMS=SkywaysGlut SkywaysQt SkywaysSdl SkywaysGlut_BINARY=sky...
devnev/skyways	1117cafe2587b2eefc1da5b9d5d2249c21caecfd	Added forgotten random seeding.	diff --git a/src/controller.cpp b/src/controller.cpp index fb6e7cc..d47890e 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -1,211 +1,212 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it u...
devnev/skyways	99c19f987559bb29d6f4fc5b6ba180f5c4354052	Fixed gitignore for qt moc output.	diff --git a/.gitignore b/.gitignore index 1cc84c3..616b08a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ .o .d skyways.glut skyways.qt skyways.sdl -src/moc_qtwindow.cpp +moc_*.cpp
devnev/skyways	08f616aaa6efdd81b5c0b7f64b4f6859d62d192d	Restructured src directory.	diff --git a/Makefile b/Makefile index f1194e9..a3e1e66 100644 --- a/Makefile +++ b/Makefile @@ -1,161 +1,157 @@ - -########################### -# prelude: do not change! # -########################### - -CWD:=$(shell pwd) - -default: all - -BUILDFLAGS=CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - -define FLAGINIT_template - ifn...
devnev/skyways	335db70cc43457ca22f0d4c3b2a523887188284a	Seperated map loading out of map container classes.	diff --git a/Makefile b/Makefile index d25e263..f1194e9 100644 --- a/Makefile +++ b/Makefile @@ -1,155 +1,161 @@ ########################### # prelude: do not change! # ########################### CWD:=$(shell pwd) default: all BUILDFLAGS=CFLAGS CPPFLAGS CXXFLAGS LDFLAGS define FLAGINIT_template ifn...
devnev/skyways	8b9adae3be119bea6620be6aa8e40f32c56137b4	Created seperate method to parse individual map rows.	diff --git a/src/map.cpp b/src/map.cpp index ea48de1..746d90b 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1,322 +1,318 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU Ge...
devnev/skyways	da88ae4e11e7a3e2a025067292b1302c5fd5c199	Seperated parsing map tiles out of loadMap method.	diff --git a/src/map.cpp b/src/map.cpp index bfc55e2..ea48de1 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1,313 +1,322 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU Ge...
devnev/skyways	dc44f62a7c921f19963ee4e5c611017ed0b7a324	Seperated alias parsing out of loadMap.	diff --git a/src/map.cpp b/src/map.cpp index 4282ddf..bfc55e2 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1,304 +1,313 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU Ge...
devnev/skyways	2c1f019d8ed3a74c974857fb321cab88b7c567e8	Fixed const-correctness in drawing methods.	diff --git a/src/block.cpp b/src/block.cpp index d89335c..e222e5a 100644 --- a/src/block.cpp +++ b/src/block.cpp @@ -1,131 +1,131 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it under the terms of th...
devnev/skyways	a9d4a2e26a82dfcb302ff89b72a023c6ce03206e	Store target block directly in BlockPos struct.	diff --git a/src/map.cpp b/src/map.cpp index 2f6c82d..e197f4a 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1,301 +1,304 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU Ge...
devnev/skyways	3f782cd8d2d06e5052ce83b9d43f4a1e8504ef71	Simplified world file format to use command-like syntax.	diff --git a/src/map.cpp b/src/map.cpp index 5628dab..2f6c82d 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1,285 +1,301 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU Ge...
devnev/skyways	d68aadaee7063565c14bbd6f6e3c1441a9b45d48	Fixed collision bug in AABB.	diff --git a/src/aabb.hpp b/src/aabb.hpp index 097975b..010db39 100644 --- a/src/aabb.hpp +++ b/src/aabb.hpp @@ -1,66 +1,66 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU ...
devnev/skyways	d5975953ecca437c5937c9b32c5bb23ac661706a	Implemented setting start coordinates in map description files.	diff --git a/src/controller.cpp b/src/controller.cpp index 10f924f..f09deee 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -1,196 +1,197 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it u...
devnev/skyways	a8833ed60e08296ab72dcfb157051c453a51707e	Added drawing of gradient background.	diff --git a/src/controller.cpp b/src/controller.cpp index ff4f3ec..10f924f 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -1,186 +1,196 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it u...
devnev/skyways	4563b1c450d8c91d2c9c8b92d2d5c55843d3c56a	Implemented death trigger.	diff --git a/src/element.hpp b/src/element.hpp index 5b43bc6..ae75841 100644 --- a/src/element.hpp +++ b/src/element.hpp @@ -1,53 +1,60 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it under the terms...
devnev/skyways	be3e3fb6324b12ee18d61259b4f3cefc69b89304	Moved suicide message into game class.	diff --git a/src/controller.cpp b/src/controller.cpp index cc0a1a5..ff4f3ec 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -1,186 +1,186 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it u...
devnev/skyways	8ec9abe9dba361a4844f4fe82be9c94cac3bfed7	Integrated death cause into game class.	diff --git a/src/controller.cpp b/src/controller.cpp index f2ea7b3..cc0a1a5 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -1,188 +1,186 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it u...
devnev/skyways	133b76f5ce477fdd03d47b0a5606e245588bcb01	Moved death state into Game class.	diff --git a/src/controller.cpp b/src/controller.cpp index cf003fd..f2ea7b3 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -1,197 +1,188 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it u...
devnev/skyways	e60c1c1a78fd33fae7233dd179af1ff717b6690c	Renamed class World to Game.	diff --git a/Makefile b/Makefile index 69a6f86..d25e263 100644 --- a/Makefile +++ b/Makefile @@ -1,155 +1,155 @@ ########################### # prelude: do not change! # ########################### CWD:=$(shell pwd) default: all BUILDFLAGS=CFLAGS CPPFLAGS CXXFLAGS LDFLAGS define FLAGINIT_template ifn...
devnev/skyways	59d8b3e3df4ee6770bb0ee6e900737193a36630b	Removed edge highlighting.	diff --git a/src/element.cpp b/src/element.cpp index 8d66a43..3384cff 100644 --- a/src/element.cpp +++ b/src/element.cpp @@ -1,51 +1,45 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it under the terms...
devnev/skyways	2229ad3acf5cd582d15101adee8effc12c409be6	Added optional flag to alias definitions in world file format.	diff --git a/src/map.cpp b/src/map.cpp index 568c477..8c3cf52 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1,257 +1,273 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU Ge...
devnev/skyways	fc238197a897c7fb2c5389e2ad8d5d45ed79b087	Fixed level generation so blocks don't overlap.	diff --git a/src/map.cpp b/src/map.cpp index 1504f97..568c477 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1,238 +1,257 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU Ge...
devnev/skyways	24f3ad7a6d5fa1eb462750814cad1f08df40cf22	Added support for shader uniforms.	diff --git a/src/shader.cpp b/src/shader.cpp index d367257..3d97ed0 100644 --- a/src/shader.cpp +++ b/src/shader.cpp @@ -1,139 +1,145 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it under the terms o...
devnev/skyways	afd7eedc6b496d5d79d045457d32a07d2a300536	Added shader reference to world, enable shader from there.	diff --git a/src/controller.cpp b/src/controller.cpp index ce59257..c3a553f 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -1,197 +1,197 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it u...
devnev/skyways	f3f66cb818a1c5b6bd0aaf7f2da00fc9a252502a	Changed rendering to reset shader before rendering text.	diff --git a/src/controller.cpp b/src/controller.cpp index f27d998..ce59257 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -1,196 +1,197 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it u...
devnev/skyways	4ed6d4e46b319af212a43b9b0ec9665d6015922a	Added method to load simple two-file shaders.	diff --git a/src/controller.cpp b/src/controller.cpp index bc00c91..f27d998 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -1,207 +1,196 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it u...
devnev/skyways	a4eac87360b1d76c2c19e841b8d9975a27d6b960	Moved shader implementation into shader.cpp file, updated Makefile.	diff --git a/Makefile b/Makefile index 34631fe..69a6f86 100644 --- a/Makefile +++ b/Makefile @@ -1,153 +1,155 @@ ########################### # prelude: do not change! # ########################### CWD:=$(shell pwd) default: all BUILDFLAGS=CFLAGS CPPFLAGS CXXFLAGS LDFLAGS define FLAGINIT_template ifn...
devnev/skyways	42cc18db72338dd709a7ff67a84620d61a85f1e3	Added status check to shader program linking.	diff --git a/src/shader.hpp b/src/shader.hpp index f37d90e..ece099d 100644 --- a/src/shader.hpp +++ b/src/shader.hpp @@ -1,180 +1,192 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it under the terms o...
devnev/skyways	c58403c0fc029bf30114aceae378616f780b5858	Added status check to shader compilation.	diff --git a/src/shader.hpp b/src/shader.hpp index 289998d..f37d90e 100644 --- a/src/shader.hpp +++ b/src/shader.hpp @@ -1,169 +1,180 @@ // // This file is part of the game Skyways. // Copyright (C) 2009 Mark Nevill // // This program is free software; you can redistribute it and/or // modify it under the terms o...
devnev/skyways	9de2544caa559f3067e4b85646b12edc37e808b2	Added preliminary OpenGL shader support.	diff --git a/shaders/shader.glslf b/shaders/shader.glslf new file mode 100644 index 0000000..5d7b89e --- /dev/null +++ b/shaders/shader.glslf @@ -0,0 +1,4 @@ +void main() +{ + gl_FragColor = gl_Color; +} diff --git a/shaders/shader.glslv b/shaders/shader.glslv new file mode 100644 index 0000000..567512d --- /dev/null +...
devnev/skyways	12cb531cc0b288f31a83f44054f4ebea24119ba5	Added SDL-dependant binary to gitignore.	diff --git a/.gitignore b/.gitignore index 008a1b0..1cc84c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .o .d skyways.glut skyways.qt +skyways.sdl src/moc_qtwindow.cpp
devnev/skyways	d2fc00d2d76d14a8b066682cef4bfab61e2fc4f2	Added GLEW includes and initialization.	diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..008a1b0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +.o +.d +skyways.glut +skyways.qt +src/moc_qtwindow.cpp diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..d511905 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ + GNU GE...
rbonvall/grasp-crew-scheduling	80a989086020e392bfdb167b7a201a3ba6e94b97	Find best solution	diff --git a/ga.py b/ga.py index 412394e..2a2eb1e 100755 --- a/ga.py +++ b/ga.py @@ -1,170 +1,172 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	d8f417f8711dda63cb6e892bad8dadedd731c38a	Ranking replacement implementation	diff --git a/ga.py b/ga.py index 685628f..412394e 100755 --- a/ga.py +++ b/ga.py @@ -1,148 +1,170 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	faf8cae0c5b0edbe57a33845928512d3c445b99e	Smart solution construction	diff --git a/ga.py b/ga.py index 12ccb5c..685628f 100755 --- a/ga.py +++ b/ga.py @@ -1,137 +1,148 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	0cf0d7ef35a4bfb3c60d1ef64f09add77971c3d2	Copy code from gamatrix to init alpha and beta	diff --git a/ga.py b/ga.py index 62c4cb5..12ccb5c 100755 --- a/ga.py +++ b/ga.py @@ -1,120 +1,137 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	d80b24c43c0bb2eebda6abf0a568d5fd2a8b3409	Use unsigned matrices	diff --git a/ga.py b/ga.py index 3e7d588..62c4cb5 100755 --- a/ga.py +++ b/ga.py @@ -1,120 +1,120 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	9910e95b325ebc5b958a28c861fef520a7c05f51	Print solution	diff --git a/ga.py b/ga.py index c20d4aa..3e7d588 100755 --- a/ga.py +++ b/ga.py @@ -1,119 +1,120 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	115564b402f0f9e96e81b8afd1512f5152cdac49	Split mutation into static_ and adaptive_mutation	diff --git a/ga.py b/ga.py index 346aaa8..c20d4aa 100755 --- a/ga.py +++ b/ga.py @@ -1,117 +1,119 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	6df74d8e2bb11743b7474028cd39788845cc7d49	Static mutation implemented	diff --git a/ga.py b/ga.py index c4d6fe1..346aaa8 100755 --- a/ga.py +++ b/ga.py @@ -1,111 +1,117 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	e9e21be03a86c8337859b5df665e0f3b285b7207	chmod +x ga.py	diff --git a/ga.py b/ga.py old mode 100644 new mode 100755
rbonvall/grasp-crew-scheduling	c8d988eb339e1f960d9c507f53ecb56b7254866c	Remove more numpy references	diff --git a/ga.py b/ga.py index 67f4bdc..d153e44 100644 --- a/ga.py +++ b/ga.py @@ -1,111 +1,111 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	05e98c70d3c27a4b6e5d62aeccd36c6eba0c2fb8	numpy.zeros -> zeros call	diff --git a/ga.py b/ga.py index b7a0981..67f4bdc 100644 --- a/ga.py +++ b/ga.py @@ -1,111 +1,111 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	dd8ec8e60493c8924bc8dda6dc3ca2366aaf52d0	Print usage instead of help	diff --git a/ga.py b/ga.py index e808df2..d977c0b 100644 --- a/ga.py +++ b/ga.py @@ -1,118 +1,118 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	b5ebc282a334e0acf9e491812fb125c408f517d5	Rewrite matching related functions	diff --git a/ga.py b/ga.py index 448c114..b7a0981 100644 --- a/ga.py +++ b/ga.py @@ -1,107 +1,111 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	fc53758bbb5f5b5edfc6d1a686a3e7261ecb43b5	Rewrite uniform_crossover function	diff --git a/ga.py b/ga.py index 6f9df8f..448c114 100644 --- a/ga.py +++ b/ga.py @@ -1,109 +1,107 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	c550a8baff62fda3fc3b7a0477779aaab1e593b5	Rewrite some no-op functions	diff --git a/ga.py b/ga.py index 55df06b..6f9df8f 100644 --- a/ga.py +++ b/ga.py @@ -1,105 +1,109 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	05741b19d8dac7cea8f9fe690e295732838be57f	Rewrite ga function	diff --git a/ga.py b/ga.py index 1640fc9..55df06b 100644 --- a/ga.py +++ b/ga.py @@ -1,105 +1,105 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	800255aa1183295156edb0ddd0e266b85a27aba4	Import names from numpy	diff --git a/ga.py b/ga.py index 75bd077..1640fc9 100644 --- a/ga.py +++ b/ga.py @@ -1,105 +1,105 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	db907f61f18d8b509ba06736dc0c866d1d52555a	Dumb solution construction, for the moment	diff --git a/ga.py b/ga.py index e418681..75bd077 100644 --- a/ga.py +++ b/ga.py @@ -1,105 +1,105 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	7b2a3022879ec884942bd4980118f731891339a9	Solution as namedtuple, and constructor function	diff --git a/ga.py b/ga.py index a192a14..e418681 100644 --- a/ga.py +++ b/ga.py @@ -1,119 +1,105 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	37696c0318ebc275cac4b8bef58be6f366e200c0	Add problem size information to Problem	diff --git a/ga.py b/ga.py index e808df2..a192a14 100644 --- a/ga.py +++ b/ga.py @@ -1,118 +1,119 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	46d1ee2bff78964b36c74c6472c1061feb99636e	Exit when no command line arg is given	diff --git a/ga.py b/ga.py index a56f4d9..e808df2 100644 --- a/ga.py +++ b/ga.py @@ -1,115 +1,118 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	6e25088dc1052cb8f6f89c6ad07b34923daa6c43	Problem.c -> Problem.rotation_costs	diff --git a/gamatrix.py b/gamatrix.py index 0e56cbe..eb6b7c6 100644 --- a/gamatrix.py +++ b/gamatrix.py @@ -1,87 +1,86 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, ...
rbonvall/grasp-crew-scheduling	381f88df8275a2dafe81f7fd874ba7288113bcb0	Use unsigned matrices	diff --git a/gamatrix.py b/gamatrix.py index 307a020..0e56cbe 100644 --- a/gamatrix.py +++ b/gamatrix.py @@ -1,87 +1,87 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, ...
rbonvall/grasp-crew-scheduling	1d8041fcf59eba9cc7723ef8aca8b2f1e7df3169	Genetic algorithm outline	diff --git a/gamatrix.py b/gamatrix.py index 2d041ee..307a020 100644 --- a/gamatrix.py +++ b/gamatrix.py @@ -1,73 +1,87 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, ...
rbonvall/grasp-crew-scheduling	6b2f8b55ba06ad0ed0260c4573c8e78aa7176bb8	Initial solution as function rather than method	diff --git a/gamatrix.py b/gamatrix.py index a77481c..2d041ee 100644 --- a/gamatrix.py +++ b/gamatrix.py @@ -1,79 +1,73 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, ...
rbonvall/grasp-crew-scheduling	c702d7a22a1c1dc712e3419cddcf532c9fb2c141	Problem __repr__	diff --git a/gamatrix.py b/gamatrix.py index de2d3c6..a77481c 100644 --- a/gamatrix.py +++ b/gamatrix.py @@ -1,76 +1,79 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, ...
rbonvall/grasp-crew-scheduling	a4e25a43567f1ca9d5338a2b6531a753c01101b4	Method for constructing initial population	diff --git a/gamatrix.py b/gamatrix.py index 2602382..de2d3c6 100644 --- a/gamatrix.py +++ b/gamatrix.py @@ -1,61 +1,76 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, ...
rbonvall/grasp-crew-scheduling	01d3375f9aa55a313a3b0cc589d3cd40d53b5055	Freeze alpha and beta, add nr_rows & nr_cols	diff --git a/gamatrix.py b/gamatrix.py index 8b5aedb..2602382 100644 --- a/gamatrix.py +++ b/gamatrix.py @@ -1,60 +1,61 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, ...
rbonvall/grasp-crew-scheduling	1a9824b920e08430f51342fa0e2c544358feb062	Describe problem with matrices	diff --git a/gamatrix.py b/gamatrix.py new file mode 100644 index 0000000..8b5aedb --- /dev/null +++ b/gamatrix.py @@ -0,0 +1,60 @@ +#!/usr/bin/env python + +# Genetic algorithm taken from: +# P.C.Chu, J.E.Beasley. +# Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. +# Journal of Heu...
rbonvall/grasp-crew-scheduling	fe758da7a374dade150dd2e94b00eafaddb89edd	Fitness and unfitness implementation	diff --git a/ga.py b/ga.py index 3d8590c..a56f4d9 100644 --- a/ga.py +++ b/ga.py @@ -1,112 +1,115 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	603ad278afdbd2fab01d6469474910d56b807dad	Problem class	diff --git a/ga.py b/ga.py index 4b02784..3d8590c 100644 --- a/ga.py +++ b/ga.py @@ -1,107 +1,112 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	c7614809f387690716760ae8b38b605671abc92c	Create matrix A and cost vector	diff --git a/ga.py b/ga.py index 4fa7e78..4b02784 100644 --- a/ga.py +++ b/ga.py @@ -1,95 +1,107 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) ...
rbonvall/grasp-crew-scheduling	59930e0357d9367bb754cf8a35f445dfe4fe16ca	import numpy	diff --git a/ga.py b/ga.py index 9a83182..4fa7e78 100644 --- a/ga.py +++ b/ga.py @@ -1,96 +1,95 @@ #!/usr/bin/env python # Genetic algorithm taken from: # P.C.Chu, J.E.Beasley. # Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. # Journal of Heuristics, 11: 323--357 (1998) f...
rbonvall/grasp-crew-scheduling	fde6fa10915e1e73ad8e0de5db6d174c31299858	Skeleton of genetic algorithm	diff --git a/ga.py b/ga.py new file mode 100644 index 0000000..9a83182 --- /dev/null +++ b/ga.py @@ -0,0 +1,96 @@ +#!/usr/bin/env python + +# Genetic algorithm taken from: +# P.C.Chu, J.E.Beasley. +# Constraint Handling in Genetic Algorithms: The Set Partitioning Problem. +# Journal of Heuristics, 11: 323--...
rbonvall/grasp-crew-scheduling	598c1aea8c361617b0cd0f2415b65603330d89aa	Set debugging output from command line	diff --git a/grasp.py b/grasp.py index 35cfeea..8e0028c 100755 --- a/grasp.py +++ b/grasp.py @@ -1,99 +1,106 @@ #!/usr/bin/env python from csp import CrewSchedulingProblem, namedtuple from random import choice, random from functools import partial from operator import attrgetter from sys import stdout range = ...
rbonvall/grasp-crew-scheduling	4d8174f5eaed24e2cc7e949d12dfd6e626ee337e	Transparent background for debugging output	diff --git a/grasp.py b/grasp.py index 76b0846..35cfeea 100755 --- a/grasp.py +++ b/grasp.py @@ -1,99 +1,99 @@ #!/usr/bin/env python from csp import CrewSchedulingProblem, namedtuple from random import choice, random from functools import partial from operator import attrgetter from sys import stdout range = x...
rbonvall/grasp-crew-scheduling	caa6aa78c63629c903229ded151e985b4beda1bf	Remove unused DEBUG function	diff --git a/grasp.py b/grasp.py index 1eec7df..76b0846 100755 --- a/grasp.py +++ b/grasp.py @@ -1,101 +1,99 @@ #!/usr/bin/env python from csp import CrewSchedulingProblem, namedtuple from random import choice, random from functools import partial from operator import attrgetter from sys import stdout range = ...
rbonvall/grasp-crew-scheduling	feb97375f5450a7985a2b5867f08dce56262a62a	Moved end condition of construction stage	diff --git a/grasp.py b/grasp.py index b53d1ce..1eec7df 100755 --- a/grasp.py +++ b/grasp.py @@ -1,103 +1,101 @@ #!/usr/bin/env python from csp import CrewSchedulingProblem, namedtuple from random import choice, random from functools import partial from operator import attrgetter from sys import stdout range =...
rbonvall/grasp-crew-scheduling	3762fae0e5a1e24f4514144883a4be44030167a6	Refactor to compute all greedy costs at beginning	diff --git a/grasp.py b/grasp.py index 8614d4a..b53d1ce 100755 --- a/grasp.py +++ b/grasp.py @@ -1,97 +1,103 @@ #!/usr/bin/env python -from csp import CrewSchedulingProblem +from csp import CrewSchedulingProblem, namedtuple from random import choice, random from functools import partial +from operator import attrg...
rbonvall/grasp-crew-scheduling	e67cb14289d98a3519c843d21d09b681428212b3	Command line arguments for parameter setting	diff --git a/grasp.py b/grasp.py index 4e97e94..8614d4a 100755 --- a/grasp.py +++ b/grasp.py @@ -1,94 +1,97 @@ #!/usr/bin/env python from csp import CrewSchedulingProblem from random import choice, random from functools import partial from sys import stdout range = xrange def DEBUG(s): print s def DEBUG_R...
rbonvall/grasp-crew-scheduling	3d3da284370057aaea8cb36c4608e9c777c50fdf	rm commented fixed-size rcl construction	diff --git a/grasp.py b/grasp.py index d22b837..4e97e94 100755 --- a/grasp.py +++ b/grasp.py @@ -1,95 +1,94 @@ #!/usr/bin/env python from csp import CrewSchedulingProblem from random import choice, random from functools import partial from sys import stdout range = xrange def DEBUG(s): print s def DEBUG_R...
rbonvall/grasp-crew-scheduling	3658e9e38b1d8f12a782c6125325a2429256385c	alpha and greedy_cost set outside grasp	diff --git a/grasp.py b/grasp.py index 2347fe4..d22b837 100755 --- a/grasp.py +++ b/grasp.py @@ -1,95 +1,95 @@ #!/usr/bin/env python from csp import CrewSchedulingProblem from random import choice, random from functools import partial from sys import stdout range = xrange def DEBUG(s): print s def DEBUG_R...
rbonvall/grasp-crew-scheduling	7af31739e6190b8fd1f6ed5c0758fb9951331d5d	Solution printing refactored	diff --git a/grasp.py b/grasp.py index c0650c7..2347fe4 100755 --- a/grasp.py +++ b/grasp.py @@ -1,87 +1,95 @@ #!/usr/bin/env python from csp import CrewSchedulingProblem from random import choice, random from functools import partial from sys import stdout range = xrange def DEBUG(s): print s + def DEBUG_R...
rbonvall/grasp-crew-scheduling	ca735a4cf9a0f26faef97ad103eee1e07101f66e	chmod +x csp.py grasp.py	diff --git a/csp.py b/csp.py old mode 100644 new mode 100755 diff --git a/grasp.py b/grasp.py old mode 100644 new mode 100755
rbonvall/grasp-crew-scheduling	b817a684bea17622e5a37117600823f65031ac27	Put writes together in DEBUG_RCL	diff --git a/grasp.py b/grasp.py index 776671e..c0650c7 100644 --- a/grasp.py +++ b/grasp.py @@ -1,87 +1,87 @@ #!/usr/bin/env python from csp import CrewSchedulingProblem from random import choice, random from functools import partial from sys import stdout range = xrange def DEBUG(s): print s def DEBUG_RCL...
rbonvall/grasp-crew-scheduling	2c336b05d20a97e2e553fd4b0ec75ea99f3398ab	DEBUG_RCL refactored	diff --git a/grasp.py b/grasp.py index 5ba2226..776671e 100644 --- a/grasp.py +++ b/grasp.py @@ -1,87 +1,87 @@ #!/usr/bin/env python from csp import CrewSchedulingProblem from random import choice, random from functools import partial +from sys import stdout range = xrange def DEBUG(s): print s -def DEBUG_RCL...
rbonvall/grasp-crew-scheduling	b9d59c92a6faf28b7f30a974dade2694b4b5c8ab	Sort available rotations by greedy cost	diff --git a/grasp.py b/grasp.py index 49c79ef..5ba2226 100644 --- a/grasp.py +++ b/grasp.py @@ -1,87 +1,87 @@ #!/usr/bin/env python from csp import CrewSchedulingProblem from random import choice, random from functools import partial range = xrange def DEBUG(s): print s def DEBUG_RCL(rotations, rcl, selecte...
rbonvall/grasp-crew-scheduling	8edcf1096058b0befcc5539518ffcb4dfc6ca9a2	Bug fixed in rcl selection (s/</<=/)	diff --git a/grasp.py b/grasp.py index 84de028..49c79ef 100644 --- a/grasp.py +++ b/grasp.py @@ -1,87 +1,87 @@ #!/usr/bin/env python from csp import CrewSchedulingProblem from random import choice, random from functools import partial range = xrange def DEBUG(s): print s def DEBUG_RCL(rotations, rcl, selecte...

Subsets and Splits

No community queries yet

The top public SQL queries from the community will appear here once available.