From 3caf13085a6ae1ae41d6f489c8b69206b0ffa48d Mon Sep 17 00:00:00 2001
From: Francois Fleuret <fleuret@kitten.fleuret.org>
Date: Wed, 14 Nov 2007 18:02:11 -0500
Subject: [PATCH] automatic commit
---
approximer.cc | 15 ++-------------
approximer.h | 15 ++-------------
dummy.cc | 17 +++--------------
hit_shape.cc | 17 +++--------------
intelligence.cc | 17 +++--------------
intelligence.h | 15 ++-------------
main.cc | 17 +++--------------
manipulator.cc | 15 ++-------------
manipulator.h | 15 ++-------------
map.cc | 15 ++-------------
map.h | 15 ++-------------
misc.cc | 15 ++-------------
misc.h | 15 ++-------------
move_square.cc | 17 +++--------------
polygon.cc | 15 ++-------------
polygon.h | 15 ++-------------
retina.cc | 17 +++--------------
retina.h | 17 +++--------------
simple_window.cc | 19 ++++---------------
simple_window.h | 19 ++++---------------
task.cc | 17 +++--------------
task.h | 19 ++++---------------
universe.cc | 15 ++-------------
universe.h | 15 ++-------------
variables.cc | 15 ++-------------
variables.h | 15 ++-------------
26 files changed, 66 insertions(+), 352 deletions(-)
diff --git a/approximer.cc b/approximer.cc
index 8a82a84..c1b0e7c 100644
--- a/approximer.cc
+++ b/approximer.cc
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#include "approximer.h"
diff --git a/approximer.h b/approximer.h
index 20019e9..72e683a 100644
--- a/approximer.h
+++ b/approximer.h
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#ifndef APPROXIMER_H
#define APPROXIMER_H
diff --git a/dummy.cc b/dummy.cc
index 73a06f3..f225285 100644
--- a/dummy.cc
+++ b/dummy.cc
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#include "task.h"
#include "universe.h"
@@ -20,7 +9,7 @@
class Dummy : public Task {
public:
- virtual char *name() { return "DUMMY"; }
+ virtual const char *name() { return "DUMMY"; }
virtual int nb_degrees() { return 1; }
diff --git a/hit_shape.cc b/hit_shape.cc
index 12d4582..28b2778 100644
--- a/hit_shape.cc
+++ b/hit_shape.cc
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#include "task.h"
#include "universe.h"
@@ -28,7 +17,7 @@ class MoveSquare : public Task {
public:
- virtual char *name() { return "HIT_SQUARE"; }
+ virtual const char *name() { return "HIT_SQUARE"; }
virtual int nb_degrees() { return 1; }
diff --git a/intelligence.cc b/intelligence.cc
index 1f7968d..558be7a 100644
--- a/intelligence.cc
+++ b/intelligence.cc
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#include "intelligence.h"
@@ -189,7 +178,7 @@ void Intelligence::learn(scalar_t proportion_for_training) {
int Intelligence::best_action() {
int max_a = -1;
- scalar_t q, max_q;
+ scalar_t q, max_q = 0;
cout << "ACTION_SCORES";
for(int a = 0; a < _nb_actions; a++) {
q = _q_predictors[a]->predict(_input->parameters);
diff --git a/intelligence.h b/intelligence.h
index d17e305..5b6c111 100644
--- a/intelligence.h
+++ b/intelligence.h
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#include "map.h"
#include "approximer.h"
diff --git a/main.cc b/main.cc
index 8c98473..b677526 100644
--- a/main.cc
+++ b/main.cc
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#include <iostream>
#include <fstream>
@@ -40,7 +29,7 @@ using namespace std;
//////////////////////////////////////////////////////////////////////
-void check_opt(int argc, char **argv, int n_opt, int n, char *help) {
+void check_opt(int argc, char **argv, int n_opt, int n, const char *help) {
if(n_opt + n >= argc) {
cerr << "Missing argument for " << argv[n_opt] << "." << endl;
cerr << "Expecting " << help << "." << endl;
diff --git a/manipulator.cc b/manipulator.cc
index b17da00..ca6a144 100644
--- a/manipulator.cc
+++ b/manipulator.cc
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#include "manipulator.h"
diff --git a/manipulator.h b/manipulator.h
index f01abd7..0b8c0a1 100644
--- a/manipulator.h
+++ b/manipulator.h
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#ifndef MANIPULATOR_CC
#define MANIPULATOR_CC
diff --git a/map.cc b/map.cc
index 183218b..dc3411e 100644
--- a/map.cc
+++ b/map.cc
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#include "map.h"
diff --git a/map.h b/map.h
index ae91f28..d9a1e87 100644
--- a/map.h
+++ b/map.h
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#ifndef MAP_H
#define MAP_H
diff --git a/misc.cc b/misc.cc
index 9d739dd..1a0f710 100644
--- a/misc.cc
+++ b/misc.cc
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#include "misc.h"
diff --git a/misc.h b/misc.h
index d5f1b24..add2acd 100644
--- a/misc.h
+++ b/misc.h
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#ifndef MISC_H
#define MISC_H
diff --git a/move_square.cc b/move_square.cc
index 4ce403b..5aed572 100644
--- a/move_square.cc
+++ b/move_square.cc
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#include "task.h"
#include "universe.h"
@@ -27,7 +16,7 @@ class MoveSquare : public Task {
public:
- virtual char *name() { return "MOVE_SQUARE"; }
+ virtual const char *name() { return "MOVE_SQUARE"; }
virtual int nb_degrees() { return 5; }
diff --git a/polygon.cc b/polygon.cc
index 75163cb..b560b8b 100644
--- a/polygon.cc
+++ b/polygon.cc
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#include <cmath>
#include "polygon.h"
diff --git a/polygon.h b/polygon.h
index d7caa9d..9d35d3b 100644
--- a/polygon.h
+++ b/polygon.h
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#ifndef POLYGON_H
#define POLYGON_H
diff --git a/retina.cc b/retina.cc
index 45975ba..db0f543 100644
--- a/retina.cc
+++ b/retina.cc
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#include "retina.h"
@@ -199,7 +188,7 @@ void Retina::raw_rectangle(unsigned char *image, int xmin, int ymin, int w, int
}
}
-void Retina::save_as_ppm(char *filename) {
+void Retina::save_as_ppm(const char *filename) {
unsigned char *image = new unsigned char[_width * _height * 3];
diff --git a/retina.h b/retina.h
index f562c49..a17f179 100644
--- a/retina.h
+++ b/retina.h
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#ifndef RETINA_H
#define RETINA_H
@@ -113,7 +102,7 @@ public:
void draw_on_universe(SimpleWindow *window);
void draw_parameters(int x0, int y0, SimpleWindow *window);
- void save_as_ppm(char *filename);
+ void save_as_ppm(const char *filename);
};
#endif
diff --git a/simple_window.cc b/simple_window.cc
index 502e1dd..3ab3c81 100644
--- a/simple_window.cc
+++ b/simple_window.cc
@@ -1,23 +1,12 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#include "simple_window.h"
SimpleEvent::SimpleEvent() : type(UNDEFINED) {}
-SimpleWindow::SimpleWindow(char *name, int x, int y, int w, int h) {
+SimpleWindow::SimpleWindow(const char *name, int x, int y, int w, int h) {
_width = w; _height = h;
@@ -132,7 +121,7 @@ void SimpleWindow::draw_circle(int x, int y, int r) {
XDrawArc(_display, _pixmap, _gc, x-r, y-r, 2*r, 2*r, 0, 360*64);
}
-void SimpleWindow::draw_text(char *s, int x, int y) {
+void SimpleWindow::draw_text(const char *s, int x, int y) {
XDrawString(_display, _pixmap, _gc, x, y, s, strlen(s));
}
diff --git a/simple_window.h b/simple_window.h
index 3761fcd..37218eb 100644
--- a/simple_window.h
+++ b/simple_window.h
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#ifndef SIMPLE_WINDOW_H
#define SIMPLE_WINDOW_H
@@ -52,7 +41,7 @@ protected:
int _width, _height;
public:
- SimpleWindow(char *name, int x, int y, int w, int h);
+ SimpleWindow(const char *name, int x, int y, int w, int h);
virtual ~SimpleWindow();
virtual int width();
@@ -64,7 +53,7 @@ public:
virtual void draw_point(int x, int y);
virtual void draw_line(int x1, int y1, int x2, int y2);
virtual void draw_circle(int x, int y, int r);
- virtual void draw_text(char *s, int x, int y);
+ virtual void draw_text(const char *s, int x, int y);
virtual void fill_rectangle(int x, int y, int w, int h);
virtual void fill_polygon(int nb, int *x, int *y);
virtual void show();
diff --git a/task.cc b/task.cc
index 013c70a..99743b8 100644
--- a/task.cc
+++ b/task.cc
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#include <iostream>
#include <dlfcn.h>
@@ -26,7 +15,7 @@ Task::~Task() { }
typedef Task *TaskConstructor();
-Task *load_task(char *filename) {
+Task *load_task(const char *filename) {
void *handle = dlopen(filename, RTLD_NOW | RTLD_GLOBAL);
if(handle == 0) {
diff --git a/task.h b/task.h
index e5dab7d..6cfbb93 100644
--- a/task.h
+++ b/task.h
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#ifndef TASK_H
#define TASK_H
@@ -26,7 +15,7 @@ class Task {
public:
virtual ~Task();
// A canonical name for the task, upper caps, digits and "_"
- virtual char *name() = 0;
+ virtual const char *name() = 0;
// A task can be started with several degrees of difficulty
virtual int nb_degrees() = 0;
// Returns the size of the area
@@ -44,6 +33,6 @@ public:
// Loads a shared object file
-Task *load_task(char *filename);
+Task *load_task(const char *filename);
#endif
diff --git a/universe.cc b/universe.cc
index 4549461..983eb96 100644
--- a/universe.cc
+++ b/universe.cc
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#include "universe.h"
diff --git a/universe.h b/universe.h
index 4ea8f2e..72dc519 100644
--- a/universe.h
+++ b/universe.h
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#ifndef UNIVERSE_H
#define UNIVERSE_H
diff --git a/variables.cc b/variables.cc
index 9caf57b..aa4a31b 100644
--- a/variables.cc
+++ b/variables.cc
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#include "variables.h"
diff --git a/variables.h b/variables.h
index 7d4cafd..8eae000 100644
--- a/variables.h
+++ b/variables.h
@@ -1,17 +1,6 @@
-////////////////////////////////////////////////////////////////////////////////
-// This program is free software; you can redistribute it and/or //
-// modify it under the terms of the GNU General Public License //
-// version 2 as published by the Free Software Foundation. //
-// //
-// This program is distributed in the hope that it will be useful, but //
-// WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU //
-// General Public License for more details. //
-// //
-// Written and (C) by François Fleuret //
-// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
-////////////////////////////////////////////////////////////////////////////////
+// Written and (C) by Francois Fleuret
+// Contact <francois.fleuret@idiap.ch> for comments & bug reports
#include "misc.h"
--
2.39.5