diff --git a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/MainLan b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/MainLan
index 47cbe746dd84bb141dc2ae97c7e11a38e4023bd4..28f53f4413989d37333305b7f33ec842be081bb0 100755
Binary files a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/MainLan and b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/MainLan differ
diff --git a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/MainLan.o b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/MainLan.o
index ee78982f3b5c5290df54a0e853f0ab7a4182da86..73a599efc45d90f89a2251b0c707274e3165b02f 100644
Binary files a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/MainLan.o and b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/MainLan.o differ
diff --git a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/MainSeq b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/MainSeq
index 8a6835291ed70be6a790b42e9ea86b9dda99f159..9bbc05fb9a2859baa11d5fff3f5ab347468a4d38 100755
Binary files a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/MainSeq and b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/MainSeq differ
diff --git a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/MainSeq.o b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/MainSeq.o
index b88a15cbcdaa2a219869805c07c79a8b4197ba76..069fb895fcb0d294ad31f5adfa02eb03cd05aff2 100644
Binary files a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/MainSeq.o and b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/MainSeq.o differ
diff --git a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/datos_columnas b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/datos_columnas
index 40189a9277781f4ecd2b4b7226c7ace2a7c25ec6..09ead747c28e1b8e1d3083f5261f0912b3e89f3c 100644
--- a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/datos_columnas
+++ b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/datos_columnas
@@ -1,51 +1,31 @@
-50
-1 1 2 1 5 1 1 1 2 2 4 2 1 2 1
-3 1 1 3 3 1 3 1 3 4
-4 1 1 1 1 1 3 6 6
-2 6 2 5 2 2 4 2 5 1
-1 2 1 1 2 2 2 1 3 5 2 1 4 2
-1 2 1 1 2 1 1 2 1 3 3 3 1
-2 2 2 1 5 3 6 1 3 2 1
-2 1 1 1 1 1 3 3 2
-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
+30
+2 2 1 1 3 1 1 1 1
+3 1 1 1 2 1 3 1 2 1
+1 1 2 1 3 1 1 2 1
+3 2 1 1 2 2 1 1 1 1 1
+2 1 1 2 2 1 1 1 1
+2 1 1 1 1 3 1 1 1 1
+1 1 3 2 1 2
+1 4 3 3 1 1 3
+3 2 2 1 4 1 1 2 1
+2 3 2 3 1 1
+1 1 1 1 1 3 1 2
+3 1 7 3 1
+1 1 3 3 1 2 2 1
+3 6 1 1 3 2 1 2
+4 1 2 1 1 1 2
+2 1 3 1 1 3 2
+1 1 1 1 2 1 2 1 1
+1 1 4 1 1 2 2 3 1
+6 1 8 1 4
+1 1 1 2 3 3 1 1 1 2
+1 2 6 1 2
+2 2 1 1 1 3 1 2 4
+2 8 2 1 4 1 1
+1 2 1 1 1 2 1 2 1 1
+1 2 3 1 1 2 2 1 1
+1 3 1 5 1 1 1 5
+1 1 1 7 1 1
+1 1 1 2 1 1 1 1 1
+1 1 5 1 1 1 1 2
+1 2 2 1 5 2
diff --git a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/datos_filas b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/datos_filas
index 998618dea5c890f7919b5288ee9dfb9f88faa5fb..560120721a498657508123ba7d7df5abe2f0798f 100644
--- a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/datos_filas
+++ b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/datos_filas
@@ -1,51 +1,31 @@
-50
-1 3 3 1 2 2 1 2 1 2 3 1 1
-1 1 1 1 1 4 1 1 1 1 1 2 1 3
-1 2 3 4 3 3 2 1 1 1 1
-1 1 1 5 4 1 2 1 4 2 4 1
-1 3 2 1 1 1 1 1 1 2 1 1 1
-1 4 1 2 1 1 1 3 1 1 1 1 3 1
-1 1 5 1 4 4 3 3 2 3 2
-3 1 1 1 1 1 1 3 2 1 2 1 1 2 2
-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
+30
+1 1 3 8 2 1
+1 2 2 3 1 2 1 2
+1 1 1 4 1 5 1 1
+1 1 1 1 1 2 2 2
+4 3 2 1 1 2 1
+2 4 2 2 5 3
+3 2 1 2 1 2 3 2
+1 2 2 1 1 2 3 1 1
+1 1 7 1 2 1 1
+1 1 2 1 1 2 1
+5 1 1 2 1 2 1 3 1
+2 1 1 1 1 3 1 3 1
+1 1 2 1 3 4 1 2
+1 4 3
+2 1 1 1 2 1 1 1
+1 2 1 3 1 3 4 1 1 1
+2 1 3 3 2 1 1 1
+1 3 2 1 1 1 2 1 2 1
+3 3 3 1 1 3 1 2
+4 2 1 3 3 5 1
+1 2 5 2 3 1 1
+4 2 2 3 1 1 1 1
+1 1 1 1 1 2 4 1
+1 1 1 1 2 1 1 2 2
+2 2 2 2 1 1 2
+5 1 1 2 1 7 1
+2 1 2 2 2 2 1 1
+3 2 1 4 3 2
+1 1 3 1 2 1 1
+6 1 2 2 1 2 2
diff --git a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/newGA.hh b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/newGA.hh
index aeb5ea467c30921ce30b052c5c3c72b2a8eb53ad..43b85e8eefed29a442c421f78b99a97e286c7189 100644
--- a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/newGA.hh
+++ b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/newGA.hh
@@ -114,16 +114,16 @@ skeleton newGA
double fitness ();
unsigned int size() const;
- Rarray<int>& var(const int indexC);
+ std::vector<int>& var(const int indexC);
int& var(const int indexC, const int indexF);
- Rarray<Rarray<int>>& array_var();
+ std::vector<std::vector<int>>& array_var();
int& init();
private:
- Rarray<Rarray<int>> _var;
+ std::vector<std::vector<int>> _var;
const Problem& _pbm;
int _init;
int _deleted;
diff --git a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/newGA.pro.o b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/newGA.pro.o
index 052c3abf4a7d31ecb07a7212d34348d256bae1d4..a1d400be3bd575604e811d1296553d1232146c74 100644
Binary files a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/newGA.pro.o and b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/newGA.pro.o differ
diff --git a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/newGA.req.cc b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/newGA.req.cc
index 009b3998f9439e04b21c15d834b60fb70c73ee82..86e6f15f6ce176630b27234a3942b15dc01030db 100644
--- a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/newGA.req.cc
+++ b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/newGA.req.cc
@@ -280,17 +280,17 @@ skeleton newGA
/*
for (int i = 0; i <pbm.cantColumnas(); i++)
{
- Rarray<int> aux(pbm.cantFilas());
+ std::vector<int> aux(pbm.cantFilas());
_var[i] = aux;
}*/
_deleted = 0;
- _var = Rarray<Rarray<int>>(_pbm.cantColumnas());
+ _var = std::vector<std::vector<int>>(_pbm.cantColumnas());
for (int x = 0; x < _pbm.cantColumnas(); x++)
{
//cout<<"x=" << x << endl;
- _var[x] = Rarray<int>(_pbm.cantFilas());
+ _var[x] = std::vector<int>(_pbm.cantFilas());
for (int y = 0; y < _pbm.cantFilas(); y++)
{
//cout<<"y=" << y << endl;
@@ -309,12 +309,12 @@ skeleton newGA
{
_deleted = 0;
- _var = Rarray<Rarray<int>>(_pbm.cantColumnas());
+ _var = std::vector<std::vector<int>>(_pbm.cantColumnas());
for (int x = 0; x < _pbm.cantColumnas(); x++)
{
//cout<<"x=" << x << endl;
- _var[x] = Rarray<int>(_pbm.cantFilas());
+ _var[x] = std::vector<int>(_pbm.cantFilas());
for (int y = 0; y < _pbm.cantFilas(); y++)
{
//cout<<"y=" << y << endl;
@@ -433,12 +433,12 @@ skeleton newGA
_deleted = 0;
- _var = Rarray<Rarray<int>>(_pbm.cantColumnas());
+ _var = std::vector<std::vector<int>>(_pbm.cantColumnas());
_init = 1;
for (int x = 0; x < _pbm.cantColumnas(); x++)
{
//cout<<"x=" << x << endl;
- _var[x] = Rarray<int>(_pbm.cantFilas());
+ _var[x] = std::vector<int>(_pbm.cantFilas());
for (int y = 0; y < _pbm.cantFilas(); y++)
{
//cout<<"y=" << y << endl;
@@ -607,7 +607,7 @@ skeleton newGA
char *Solution::to_String() const
{
cout << "EN TO STRING" << endl;
- Rarray<int> aux = Rarray<int>(0); //Rarray<int>((_pbm.cantColumnas() + 1) * _pbm.cantFilas());
+ //std::vector<int> aux = std::vector<int>(0); //std::vector<int>((_pbm.cantColumnas() + 1) * _pbm.cantFilas());
/*
for (int fil = 0; fil < _pbm.cantFilas(); fil++)
@@ -802,7 +802,7 @@ skeleton newGA
//FILE---------------------------------------------------------------------------------------------------
- return (char *)aux.get_first();
+ return new char[1];
}
void Solution::to_Solution(char *_string_)
@@ -810,7 +810,7 @@ skeleton newGA
cout << "toSolution" << endl;
/*
int *ptr=(int *)_string_;
- Rarray<int> aux = Rarray<int>((_pbm.cantColumnas()+1) * _pbm.cantFilas());
+ std::vector<int> aux = std::vector<int>((_pbm.cantColumnas()+1) * _pbm.cantFilas());
for (int i=0;i< (_pbm.cantColumnas() * _pbm.cantFilas());i++)
{
aux[i]=*ptr;
@@ -850,7 +850,7 @@ skeleton newGA
{
getline(inFile2, line2);
- //Rarray<int> divided(_pbm.cantFilas());
+ //std::vector<int> divided(_pbm.cantFilas());
int f = 0;
@@ -919,7 +919,7 @@ skeleton newGA
}
- Rarray<int>& Solution::var(const int indexC)
+ std::vector<int>& Solution::var(const int indexC)
{
return _var[indexC];
}
@@ -931,7 +931,7 @@ skeleton newGA
}
- Rarray<Rarray<int>>& Solution::array_var()
+ std::vector<std::vector<int>>& Solution::array_var()
{
return _var;
}
@@ -943,16 +943,18 @@ skeleton newGA
Solution::~Solution()
{
- if (_deleted == 0)
- {
- cout << "HELLO LLDJSFLDJSLFJDSFJDJSFLJSLFJLDJS " << _deleted << endl;
+ //if (_deleted == 0)
+ //{
+ //cout << "HELLO LLDJSFLDJSLFJDSFJDJSFLJSLFJLDJS " << _deleted << endl;
_deleted++;
for (int i=0; i < _var.size();i++)
{
- _var[i].remove();
+ _var[i].clear();
+ std::vector<int>(_var[i]).swap(_var[i]);
}
- //_var.remove();
- }
+ _var.clear();
+ std::vector<std::vector<int>>(_var).swap(_var);
+ //F}
//cout << "ESTOY EN DESTRUCTOR" << endl;
//cout << "SALGO DEL DESTRUCTOR" << endl;
@@ -1066,7 +1068,7 @@ skeleton newGA
//Usamos cruzamiento de dos puntos (2PX)
int i=0;
- Rarray<Rarray<int>> aux(sol1.pbm().cantColumnas());
+ std::vector<std::vector<int>> aux(sol1.pbm().cantColumnas());
aux=sol2.array_var();
int limit=rand_int((sol1.pbm().cantColumnas()/2)+1,sol1.pbm().cantColumnas()-1);
int limit2=rand_int(0,limit-1);
@@ -1196,7 +1198,7 @@ skeleton newGA
// }
std::vector<std::vector<int>> _grupos = sol.pbm().datosColumnas();
- //Rarray<Rarray<int>> tempVar = sol.array_var();
+ //std::vector<std::vector<int>> tempVar = sol.array_var();
bool didit = false;
// cout << "printed sol" << endl;
diff --git a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/newGA.req.o b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/newGA.req.o
index 90a0d81586d7c29755706b188f4b7610f6212629..28d94e2331b05862135200d02c0b2c6197435ed5 100644
Binary files a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/newGA.req.o and b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/newGA.req.o differ
diff --git a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/res/sol.txt b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/res/sol.txt
index a89e74dfc3a251795fd6dc4ce590bb68e209bd80..d3c0ef38c1d10da656f7345fd0c520c21716c056 100644
--- a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/res/sol.txt
+++ b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/res/sol.txt
@@ -3,14 +3,14 @@
STATISTICS OF TRIALS
------------------------------------------------------------------
-1 5200 47200 46100 460 298239 576159
-2 2600 48900 27600 275 136036 508969
-3 2600 49400 9600 95 57737 501863
-4 2600 50500 65100 650 324029 505171
-5 2600 54500 12800 127 63239 490562
-6 12800 47800 53700 536 264446 493668
-7 6800 50800 1400 13 6798 476993
-8 19300 54300 900 8 4507 497995
-9 0 50800 6700 66 35140 35140
-10 26700 50200 100 0 0 0
+1 211400 409200 80000 799 3.00496e+06 3.52394e+06
+2 199100 423700 90000 899 2.4487e+06 2.70782e+06
+3 213200 427000 89100 890 2.22307e+06 2.49344e+06
+4 185600 410500 93700 936 2.50006e+06 2.66535e+06
+5 203900 407000 98100 980 2.48428e+06 2.53066e+06
+6 199300 409000 95600 955 2.40353e+06 2.51604e+06
+7 201000 409800 98100 980 2.42515e+06 2.47467e+06
+8 153000 410200 99900 998 2.98729e+06 2.99817e+06
+9 319300 418900 100 0 0 0
+10 340700 418400 100 0 0 0
------------------------------------------------------------------
diff --git a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/solution b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/solution
index 957a918e475fc69576810e2dfcb7513f91877225..eb0d5517e481085b830c4e42c14bcf7b81cc0678 100644
--- a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/solution
+++ b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/solution
@@ -1,9 +1,30 @@
-1 0 1 0 1 1 0 1 1
-0 1 1 1 0 1 0 1 1
-1 1 1 0 1 1 1 0 1
-1 0 1 1 0 0 1 0 1
-0 0 1 0 1 0 0 0 1
-0 1 0 1 0 0 1 1 0
-1 0 1 1 1 1 1 0 0
-1 1 0 1 1 0 0 0 1
-0 1 0 0 0 1 1 1 0
+0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 1 0 0 0 0 0 0 1 0 0 0 1 1 0 0 1 1 0 1 0 1 1 0 0 1 0 0 0 0
+0 1 0 0 0 0 1 0 1 0 0 0 0 1 1 0 0 0 1 0 1 1 1 0 0 0 0 1 0 1
+0 1 0 1 0 0 0 0 0 0 0 0 0 1 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 1 1 1 1 0 1 1 1 0 1 0 1 0 0 0 1 0 1 1 0 0 0 1 0 0 0 0
+1 0 1 1 1 1 0 0 1 1 0 0 0 1 1 0 0 0 1 1 1 1 1 0 1 1 1 0 0 0
+1 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 1 1 0 0 0 1 1 0 1 0 1 1 1
+0 0 0 1 0 1 1 0 1 0 0 1 0 1 0 0 1 0 1 1 1 0 1 0 0 0 0 0 0 1
+0 1 0 1 0 0 1 1 1 1 1 1 0 1 1 0 0 0 0 0 1 0 1 0 0 1 0 0 0 0
+1 0 0 0 0 0 1 0 0 1 0 0 0 1 0 0 0 1 0 0 1 1 1 0 0 0 1 0 0 0
+1 1 1 1 1 0 0 1 0 1 0 0 0 1 0 1 0 1 1 0 1 0 1 1 1 0 0 1 0 0
+0 0 1 0 0 1 0 1 0 0 0 0 1 0 0 1 0 1 0 1 1 0 1 1 1 0 0 0 0 1
+1 1 0 1 0 0 0 1 1 0 0 0 1 0 0 0 1 1 0 1 1 1 1 0 0 1 0 0 1 1
+0 0 0 0 0 0 0 1 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0
+0 0 1 1 0 1 0 0 1 0 0 0 0 0 0 1 0 0 1 1 0 1 0 0 0 1 0 0 1 0
+0 1 0 1 1 0 0 1 1 0 1 1 0 0 1 0 1 1 1 1 0 0 1 1 1 1 0 1 1 0
+1 1 0 0 0 0 0 1 0 0 0 1 0 1 1 1 0 0 1 1 0 0 1 0 0 1 0 1 1 0
+0 0 1 0 1 1 0 1 1 0 0 1 1 0 0 1 0 1 1 0 1 1 0 1 1 0 1 0 1 0
+1 0 1 1 1 0 0 0 0 0 1 1 1 0 1 1 1 0 1 1 0 1 1 0 0 0 1 0 1 1
+1 1 1 1 0 1 0 1 0 0 0 1 1 1 0 0 1 1 1 1 0 0 0 1 1 1 1 1 0 0
+1 0 0 0 1 1 0 1 1 1 1 1 0 1 1 0 0 1 1 1 0 0 1 1 0 0 1 0 1 1
+0 0 0 1 1 1 1 1 0 1 0 1 1 1 0 1 1 0 1 0 0 0 1 0 1 1 1 0 0 1
+0 0 1 0 0 0 1 0 0 0 1 0 0 0 0 0 0 1 0 1 0 0 1 1 0 0 1 1 1 1
+1 0 0 1 1 1 0 1 1 1 1 0 1 0 0 1 0 1 1 0 0 0 1 0 0 1 1 0 0 1
+0 1 1 0 0 0 0 0 0 1 1 1 1 0 0 0 1 0 0 1 0 1 0 1 1 0 0 1 1 1
+1 1 0 1 1 1 0 1 0 1 0 1 0 1 1 1 1 1 1 0 0 0 1 1 1 1 0 0 0 0
+0 0 1 0 0 0 1 0 1 0 1 1 0 0 0 1 0 1 1 1 1 1 0 0 0 1 0 1 1 0
+1 1 1 1 1 1 0 1 1 1 0 0 1 1 1 0 1 1 1 0 1 1 0 1 1 1 1 0 0 0
+0 0 0 0 0 0 1 1 0 0 1 1 0 1 1 1 0 0 1 1 0 1 1 0 0 1 0 1 1 1
+1 1 1 1 1 1 1 1 1 1 1 0 1 0 0 1 1 1 0 1 0 1 0 1 1 1 1 0 1 1
diff --git a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/tempsolution b/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/tempsolution
deleted file mode 100644
index ce711b9ac4900e72055e7599d4a58a79ff999162..0000000000000000000000000000000000000000
--- a/ProyectoFinal/AlgoritmoGenetico/malva/rep/GA/tempsolution
+++ /dev/null
@@ -1,51 +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