Skip to content
Snippets Groups Projects
Commit db857444 authored by Gonzalo Menendez Berch - ENS's avatar Gonzalo Menendez Berch - ENS
Browse files

god hath forsaken us

parent 2698f929
No related branches found
No related tags found
No related merge requests found
Showing with 205 additions and 39 deletions
File deleted
No preview for this file type
No preview for this file type
9 50
1 2 2 1 1 2 1 5 1 1 1 2 2 4 2 1 2 1
2 1 2 3 1 1 3 3 1 3 1 3 4
5 1 4 1 1 1 1 1 3 6 6
1 1 3 2 6 2 5 2 2 4 2 5 1
1 1 1 2 1 2 1 1 2 2 2 1 3 5 2 1 4 2
3 1 1 1 2 1 1 2 1 1 2 1 3 3 3 1
2 2 1 2 2 2 1 5 3 6 1 3 2 1
2 1 1 2 1 1 1 1 1 3 3 2
5 1 1 1 1 1 1 2 1 3 1 1 1 2 1 1 1 2 1
1 4 2 1 1 2 1 2 1 1 5 1 1 1 1
2 1 2 4 1 1 3 2 3 3 1 5
1 1 2 1 1 2 1 1 3 1 1 2 1
1 2 1 4 4 2 1 1 1 1 1 1 6
2 2 1 2 6 1 3 1 1 2 4 1
2 1 2 1 1 1 2 4 1 1 2 1 2 1
3 1 1 1 1 4 1 1 1 1 1 3
3 2 1 1 1 1 5 1 2 3 3 2
4 2 1 4 1 3 1 1 1 1 1 2 6 1 1
1 2 1 1 3 1 4 2 3 1 4 1 1
1 2 2 1 1 1 3 2 1 1 5
1 2 1 3 2 3 3 3 2 1 1 1 3 1
1 2 2 4 2 2 1 2 2 5 3
3 1 1 1 1 1 3 1 2 2 3 2 1 3 1
1 5 2 1 1 1 2 1 2 1 1 1 1
1 1 1 1 1 1 1 1 1 5 1 1 2 1
1 1 1 1 1 1 1 1 1 5 1 5 1
1 3 3 2 1 3 1 3 2 2 1 5
1 2 5 2 1 3 3 1 2 1 1 1
6 4 1 2 1 2 3 1 1 1 2
1 1 1 1 1 1 1 1 1 2 1 4 1
1 2 2 1 2 3 3 2 1 2 1 4
1 1 4 2 1 1 1 1 3 1 1 3 4 1 1
2 3 2 1 2 1 1 1 2 1 2 1 1
1 2 1 2 1 1 2 4 4 1 1 1 1
1 1 1 2 1 2 1 2 3 6 1 2 3
1 2 3 3 1 1 2 3 1 4 2 2
8 1 1 1 4 2 1 1 1 2 2 1
2 2 4 1 1 1 1 1 1 2 4 2
1 2 1 5 4 1 3 2 3 1 3 1
3 1 1 1 1 2 1 2 1 3 1 1 1 3
1 2 1 1 1 1 5 2 3 1 1 1 1 1 1 4
1 1 4 3 2 1 2 4 1 1 1 2 2 1
1 2 5 1 1 3 1 1 1 1 2 4
1 1 1 3 1 1 1 2 2 1 1 1 4 1 1 1
1 1 1 1 1 1 3 2 2 4 2 1 1
3 4 3 2 2 2 1 1 3 1 1 1 1
2 3 2 1 1 1 1 1 2 1 1 1 2 1 3 1 4
1 1 2 2 3 1 1 1 6 3 2 1
1 2 2 1 1 2 1 1 3 1 1 2 1 1
1 3 1 1 1 1 4 1 2 1 1 1 5
9 50
1 1 2 2 1 3 3 1 2 2 1 2 1 2 3 1 1
3 1 2 1 1 1 1 1 4 1 1 1 1 1 2 1 3
3 3 1 1 2 3 4 3 3 2 1 1 1 1
1 2 1 1 1 1 1 5 4 1 2 1 4 2 4 1
1 1 1 1 3 2 1 1 1 1 1 1 2 1 1 1
1 1 2 1 4 1 2 1 1 1 3 1 1 1 1 3 1
1 5 1 1 5 1 4 4 3 3 2 3 2
2 2 1 3 1 1 1 1 1 1 3 2 1 2 1 1 2 2
1 3 4 1 1 4 2 1 1 1 1 2 1 3 1
1 1 1 5 5 1 1 4 1 1 1
1 3 1 1 1 2 3 1 2 1 1 1 1 2
3 1 1 2 1 1 2 1 1 2 1 1 2
1 1 1 3 1 1 3 2 2 1 4 1 1
2 1 1 3 2 2 6 1 3 1 1
1 1 1 5 1 1 1 4 2 1 1 4 1
1 1 4 1 1 3 1 1 3 2 1 1
2 1 2 5 1 4 1 2 2 1 1 6
2 1 1 1 2 3 2 1 2 1 1 1 1 5
3 1 2 2 3 1 1 2 3 2 1 1 1 1 2
1 1 7 2 1 1 1 2 1 4 1 1
1 2 1 1 4 1 1 2 2 1 2 3 2
1 4 2 3 3 1 4 8 4 1
4 1 3 1 2 1 1 2 4 3 1
2 1 1 6 2 1 1 1 2 3
1 3 2 1 1 1 2 1 4 1 1 2 2 1
2 1 1 6 1 3 3 3 3 1 2
4 4 1 1 1 2 1 3 2
1 4 1 2 4 1 5 2 4 4
1 1 4 1 1 1 1 2 4 1 1 1 4 1
1 1 2 1 1 3 2 2 1 1 3 2 1 1
3 2 1 2 3 2 1 4 1 1
2 1 5 1 1 3 1 1 5 3 1 2 1
1 4 3 1 2 1 2 2 1 1 1
2 3 1 1 1 1 2 2 2 3 4 4
8 1 2 1 2 3 1 1 2 6
1 3 1 1 4 3 1 2 1 2 2 2 2
3 2 1 1 4 1 1 1 2 2 2 1
5 3 6 1 1 1 5 1 3 3 1
5 1 6 4 1 1 3 2 2 1 2 1
1 1 1 1 1 2 2 1 1 1 1 1 5 2
1 1 4 1 1 2 1 2 3 1 2 1 4 2
1 1 1 1 2 1 3 1 2 4 1 2 2 2
1 4 3 2 1 1 1 1 1 1 1 1 1 3 1 1
6 2 3 6 1 1 1 1 3 1
1 3 1 5 1 5 5 1 1 4 2 1
5 3 1 2 4 1 1 1 2 3 1 1 1 3
3 1 2 1 1 4 1 5 1 3 1 1 1 1
3 6 1 1 1 2 1 1 1 1 3 2 1 1 1
1 1 2 1 1 1 1 4 1 1 1 2 1 1
1 3 2 2 1 1 2 1 1 1 4 4
...@@ -125,7 +125,8 @@ skeleton newGA ...@@ -125,7 +125,8 @@ skeleton newGA
private: private:
Rarray<Rarray<int>> _var; Rarray<Rarray<int>> _var;
const Problem& _pbm; const Problem& _pbm;
int _init; int _init;
int _deleted;
}; };
......
...@@ -250,9 +250,27 @@ skeleton newGA ...@@ -250,9 +250,27 @@ skeleton newGA
return _cantGruposFila; return _cantGruposFila;
} }
Problem::~Problem() Problem::~Problem()
{ {
//Libero la memoria pedida para almacenar los limites de los barrios int size =_datosFilas.size();
for(int i =0; i < (size-1);i++) {
_datosFilas[i].clear();
std::vector<int>(_datosFilas[i]).swap(_datosFilas[i]);
}
std::vector<std::vector<int>>(_datosFilas).swap(_datosFilas);
size =_datosColumnas.size();
for(int i =0; i < (size-1);i++) {
_datosColumnas[i].clear();
std::vector<int>(_datosColumnas[i]).swap(_datosColumnas[i]);
}
std::vector<std::vector<int>>(_datosColumnas).swap(_datosColumnas);
_cantGruposColumna.clear();
std::vector<int>(_cantGruposColumna).swap(_cantGruposColumna);
_cantGruposFila.clear();
std::vector<int>(_cantGruposFila).swap(_cantGruposFila);
} }
// Solution -------------------------------------------------------------- // Solution --------------------------------------------------------------
...@@ -266,7 +284,7 @@ skeleton newGA ...@@ -266,7 +284,7 @@ skeleton newGA
_var[i] = aux; _var[i] = aux;
}*/ }*/
_deleted = 0;
_var = Rarray<Rarray<int>>(_pbm.cantColumnas()); _var = Rarray<Rarray<int>>(_pbm.cantColumnas());
for (int x = 0; x < _pbm.cantColumnas(); x++) for (int x = 0; x < _pbm.cantColumnas(); x++)
...@@ -289,6 +307,8 @@ skeleton newGA ...@@ -289,6 +307,8 @@ skeleton newGA
Solution::Solution(const Solution& sol):_pbm(sol.pbm()) Solution::Solution(const Solution& sol):_pbm(sol.pbm())
{ {
_deleted = 0;
_var = Rarray<Rarray<int>>(_pbm.cantColumnas()); _var = Rarray<Rarray<int>>(_pbm.cantColumnas());
for (int x = 0; x < _pbm.cantColumnas(); x++) for (int x = 0; x < _pbm.cantColumnas(); x++)
...@@ -410,6 +430,8 @@ skeleton newGA ...@@ -410,6 +430,8 @@ skeleton newGA
void Solution::initialize() void Solution::initialize()
{ {
//cout << "ESTOY ENTRANDO A INITIALIZE" << endl; //cout << "ESTOY ENTRANDO A INITIALIZE" << endl;
_deleted = 0;
_var = Rarray<Rarray<int>>(_pbm.cantColumnas()); _var = Rarray<Rarray<int>>(_pbm.cantColumnas());
_init = 1; _init = 1;
...@@ -920,10 +942,20 @@ skeleton newGA ...@@ -920,10 +942,20 @@ skeleton newGA
} }
Solution::~Solution() Solution::~Solution()
{ /* {
cout << "ESTOY EN DESTRUCTOR" << endl; if (_deleted == 0)
_var.~Rarray<Rarray<int>>(); {
cout << "SALGO DEL DESTRUCTOR" << endl; */ cout << "HELLO LLDJSFLDJSLFJDSFJDJSFLJSLFJLDJS " << _deleted << endl;
_deleted++;
for (int i=0; i < _var.size();i++)
{
_var[i].remove();
}
//_var.remove();
}
//cout << "ESTOY EN DESTRUCTOR" << endl;
//cout << "SALGO DEL DESTRUCTOR" << endl;
} }
// UserStatistics ------------------------------------------------------- // UserStatistics -------------------------------------------------------
......
No preview for this file type
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
STATISTICS OF TRIALS STATISTICS OF TRIALS
------------------------------------------------------------------ ------------------------------------------------------------------
1 16400 47500 15800 157 129087 530866 1 5200 47200 46100 460 298239 576159
2 2600 48100 34200 341 253560 586832 2 2600 48900 27600 275 136036 508969
3 16900 47300 5700 56 31397 484556 3 2600 49400 9600 95 57737 501863
4 10900 48600 2600 25 14304 505776 4 2600 50500 65100 650 324029 505171
5 18200 48200 1200 11 6566 488600 5 2600 54500 12800 127 63239 490562
6 0 56100 5700 56 29292 29292 6 12800 47800 53700 536 264446 493668
7 25500 48600 100 0 0 0 7 6800 50800 1400 13 6798 476993
8 27000 50100 100 0 0 0 8 19300 54300 900 8 4507 497995
9 20100 48700 100 0 0 0 9 0 50800 6700 66 35140 35140
10 23900 47200 100 0 0 0 10 26700 50200 100 0 0 0
------------------------------------------------------------------ ------------------------------------------------------------------
829500
0 1 0 0 0 0 1 0 0 0 1 1 0 0 0 1 0 0 1 1 1 1 1 0 1 0 1 0 1 0 1 1 0 1 1 0 1 1 1 1 0 1 1 0 1 0 1 1 0 1
0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 1 1 1 0 0 1 1 1 0 1 0 1 1 1 0 1 0 1 1 1 0 1 1 1 1
0 1 1 1 1 0 0 0 0 0 0 0 0 1 0 0 1 0 0 0 0 0 1 0 1 0 0 0 1 0 1 1 1 0 1 1 1 1 1 1 0 0 0 1 1 1 1 1 1 0
0 0 0 0 0 1 1 0 1 1 1 1 1 1 0 0 1 1 0 0 1 1 1 1 1 0 0 0 0 1 1 0 1 1 0 1 1 1 1 0 1 1 0 1 1 1 1 1 0 1
0 0 0 0 0 1 0 1 1 0 0 1 0 0 1 0 0 1 1 0 1 1 0 1 1 0 1 0 1 1 1 0 1 1 1 1 1 0 1 1 0 1 0 1 1 1 1 0 1 1
0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 1 0 0 0 0 0 1 0 1 0 1 1 0 1 0 1 0 1 1 0 1 0 1 1 1 0 1 1 1 0 1 1 1 0 1
0 0 0 0 0 0 1 1 0 0 1 1 0 0 0 0 1 1 0 0 1 0 0 1 1 1 1 1 0 1 1 1 0 1 1 1 1 1 1 0 1 0 1 1 1 0 1 1 0 1
0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 1 0 1 0 1 1 1 0 1 1 1 0 1 1
0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 1 0 1 0 1 0 1 1 0 1 0 1 1 1 0 1 0 1 0 1 0 1 1 0 1 0 1 0 1 0 1 1 0 1
0 0 0 0 0 1 0 0 0 1 1 1 1 0 0 0 1 1 0 0 1 0 1 0 0 1 1 0 1 0 1 1 0 1 0 1 0 1 1 1 1 1 0 1 0 1 0 1 0 1
1 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 1 0 1 1 1 1 0 1 0 1 0 1 1 1 0 1 1 0 1 1 1 0 1 1 1 0 1 0 1 1 1 1 1
0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 1 1 0 1 0 1 0 1 1 0 1 0 1 0 0 1 0 1 0 0 1 0 1 1 0 1
0 0 1 0 0 0 0 0 0 0 0 1 1 0 0 0 1 0 0 1 1 1 1 0 1 1 1 1 0 1 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 1 1 1 1 1
0 0 0 1 1 0 1 1 0 0 0 0 0 0 0 0 0 1 0 1 1 0 0 1 1 1 1 1 1 0 0 1 0 1 1 1 0 1 0 1 0 1 1 0 1 1 1 1 0 1
0 0 0 0 0 0 1 1 0 0 0 1 0 0 0 0 0 0 1 1 0 0 0 1 0 1 0 1 0 1 1 0 1 1 1 1 0 1 0 1 0 1 1 0 1 0 1 1 0 1
0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 1 0 0 0 1 0 1 0 0 1 0 1 1 1 1 0 1 0 1 0 1 0 1 0 1 0 1 1 1
0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 1 1 0 1 0 1 0 1 0 1 0 1 1 1 1 1 0 1 0 1 1 0 1 1 1 0 1 1 1 0 1 1
0 0 1 1 1 1 0 0 0 0 0 1 1 0 1 0 1 1 1 1 0 1 0 1 1 1 0 1 0 1 0 1 0 1 0 1 0 1 1 0 1 0 1 1 1 1 0 1 0 1
0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 1 0 1 0 1 0 1 1 1 0 0 1 0 1 1 1 1 0 1 1 0 1 1 1 0 1 0 1 1 1 1 0 1 0 1
0 0 0 0 1 0 0 0 0 1 1 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 1 0 1 0 1 0 1 1 0 0 1 1 0 1 0 1 0 1 1 1 1 1
0 0 0 0 0 0 0 0 0 1 0 1 1 0 0 1 0 1 1 1 0 1 1 0 1 1 1 0 1 1 1 0 1 1 1 0 1 1 0 1 0 1 0 1 0 1 1 1 0 1
0 0 0 0 0 1 0 0 0 0 0 1 1 0 0 1 1 0 0 0 1 1 1 1 0 1 1 0 0 1 1 0 0 1 0 1 1 0 1 1 0 1 1 1 1 1 0 1 1 1
0 0 0 0 0 0 0 0 1 1 1 0 0 1 0 0 1 0 1 0 1 0 1 0 1 1 1 0 1 0 1 1 0 1 1 0 1 1 1 0 1 1 0 1 0 1 1 1 0 1
0 1 0 0 0 0 0 1 1 1 1 1 0 0 0 0 1 1 0 0 0 0 0 0 1 0 0 0 0 1 0 0 1 0 1 1 0 0 1 0 1 1 0 1 0 1 0 1 0 1
0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 1 0 0 0 1 0 0 1 0 1 0 1 0 0 1 0 1 0 0 0 1 1 1 1 1 0 1 0 1 0 1 1 0 1
0 1 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 1 0 1 0 1 0 1 0 1 0 1 1 1 1 1 0 1 0 1 1 1 1 1 0 1
0 0 0 0 0 1 0 0 1 1 1 0 0 1 1 1 0 0 0 1 1 0 0 0 0 1 0 1 1 1 0 1 0 1 1 1 0 1 1 0 1 1 0 1 0 1 1 1 1 1
0 0 1 0 0 0 1 1 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1 0 0 1 1 1 0 1 1 1 0 1 0 1 1 0 0 1 0 1 0 1
1 1 1 1 1 1 0 0 0 0 0 1 1 1 1 0 0 1 0 0 0 0 1 1 0 0 0 0 0 1 0 0 0 0 0 1 1 0 1 1 1 0 1 0 1 0 1 0 1 1
0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 1 0 1 0 0 1 0 1 0 1 0 1 0 1 0 1 1 0 1 0 1 1 1 1 0 1
0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 1 0 1 1 0 1 0 1 1 0 1 1 1 0 1 1 1 0 1 1 0 1 0 1 1 0 1 0 1 1 1 1
0 1 0 0 0 0 0 0 1 0 0 1 1 1 1 0 0 1 1 0 1 0 0 1 0 0 1 0 1 0 1 1 1 0 1 0 1 0 1 1 1 0 0 1 1 1 0 1 0 1
0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 1 0 0 1 0 1 1 0 1 0 1 0 1 0 1 1 0 1 0 1 1 0 1 0 1
0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 1 0 0 1 0 1 1 0 1 0 1 0 1 1 0 1 1 1 1 0 1 0 0 1 0 1 0 1 0 1 0 1
0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 1 1 0 1 0 1 1 0 1 0 1 1 0 1 1 1 0 1 1 1 1 1 1 0 1 0 1 1 0 1 1 1
0 0 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 1 1 1 0 0 1 0 1 0 1 1 0 1 1 1 0 1 0 1 1 1 1 0 1 1 0 1 1
0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 0 0 0 0 1 0 0 0 1 0 1 0 1 1 1 1 0 1 1 0 1 0 1 0 1 0 1 1 0 1 1 0 1
0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1 1 1 1 0 1 0 1 0 0 0 1 0 1 0 1 0 1 1 0 1 1 1 1 0 1 1
0 0 0 0 0 0 1 0 1 1 0 0 0 0 0 0 0 1 0 1 1 1 1 1 0 1 1 1 1 0 1 0 1 1 1 0 1 1 0 0 1 1 0 1 0 1 1 1 0 1
0 0 0 0 1 1 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 1 0 1 0 1 1 0 1 0 1 1 0 1 0 1 1 1 0 1 0 1 0 1 0 1 1 1
0 0 0 0 0 0 1 0 1 1 0 0 1 0 1 0 0 1 0 1 0 1 1 1 1 1 0 1 1 0 1 1 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 1 1 1
0 0 1 0 0 1 0 0 0 0 0 0 1 1 1 1 0 1 1 1 0 1 1 0 1 0 0 0 1 1 0 1 1 1 1 0 0 1 0 1 0 1 0 1 1 0 1 1 0 1
0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 1 1 0 1 1 1 1 1 0 0 0 1 0 0 1 0 1 1 1 0 1 0 1 0 1 0 1 0 1 1 0 1 1 1 1
0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 1 0 1 1 1 0 1 0 0 1 0 1 0 0 1 1 0 0 0 1 0 1 0 1 0 1 0 1 1 0 1 0 1 0 1
0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 0 1 0 1 0 1 0 1 0 0 1 1 1 0 1 1 0 1 1 0 1 1 1 0 0 1 1 0 1 0 1
0 0 1 1 1 0 0 1 1 1 1 0 1 1 1 0 0 0 1 1 0 0 0 0 0 0 1 1 0 0 1 1 0 1 0 0 1 0 1 1 1 0 0 1 0 1 0 1 0 1
1 1 0 0 1 1 1 0 0 0 1 1 0 0 0 1 0 1 0 0 1 0 1 0 1 0 1 1 0 1 0 0 0 1 0 1 1 0 1 0 1 1 1 0 1 0 1 1 1 1
0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 1 1 0 0 0 1 1 0 1 1 1 0 1 0 1 0 1 0 1 1 1 1 1 1 0 0 0 1 1 0 1 1 0 1
0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 1 1 0 1 0 0 1 0 1 1 0 1 0 1 0 1 1 1 0 1 0 1 0 1 1 0 1 0 1
0 0 0 0 0 0 1 0 1 1 1 0 0 1 0 0 0 1 0 1 0 0 0 0 1 0 1 1 1 1 0 0 1 0 0 0 1 1 0 1 0 1 0 1 0 1 1 1 1 1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment