5 new revisions:
Revision: 6429112a5fe7
Branch: dev
Author: felix.antoine.fortin
Date: Tue Apr 8 20:52:13 2014 UTC
Log: Fix implementation bug in DTLZ2, DTLZ3 and DTLZ4.
http://code.google.com/p/deap/source/detail?r=6429112a5fe7
Revision: 5a6950ce51cd
Branch: dev
Author: felix.antoine.fortin
Date: Tue Apr 8 20:52:45 2014 UTC
Log: Add EDA examples.
http://code.google.com/p/deap/source/detail?r=5a6950ce51cd
Revision: d47fb279ba1d
Branch: default
Author: felix.antoine.fortin
Date: Tue Apr 8 20:52:13 2014 UTC
Log: Fix implementation bug in DTLZ2, DTLZ3 and DTLZ4.
http://code.google.com/p/deap/source/detail?r=d47fb279ba1d
Revision: ff1674736026
Branch: default
Author: felix.antoine.fortin
Date: Tue Apr 8 20:53:19 2014 UTC
Log: Merge.
http://code.google.com/p/deap/source/detail?r=ff1674736026
Revision: db57688c6ec3
Branch: dev
Author: felix.antoine.fortin
Date: Tue Apr 8 20:53:42 2014 UTC
Log: Merge.
http://code.google.com/p/deap/source/detail?r=db57688c6ec3
==============================================================================
Revision: 6429112a5fe7
Branch: dev
Author: felix.antoine.fortin
Date: Tue Apr 8 20:52:13 2014 UTC
Log: Fix implementation bug in DTLZ2, DTLZ3 and DTLZ4.
http://code.google.com/p/deap/source/detail?r=6429112a5fe7
Modified:
/deap/benchmarks/__init__.py
=======================================
--- /deap/benchmarks/__init__.py Thu May 10 21:40:18 2012 UTC
+++ /deap/benchmarks/__init__.py Tue Apr 8 20:52:13 2014 UTC
@@ -518,7 +518,8 @@
xm = individual[obj-1:]
g = sum((xi-0.5)**2 for xi in xm)
f = [(1.0+g) * reduce(mul, (cos(0.5*xi*pi) for xi in xc), 1.0)]
- f.extend((1.0+g) * reduce(mul, (cos(0.5*xi*pi) for xi in xc[:m-1]), 1)
* sin(0.5*xc[m]*pi) for m in reversed(xrange(obj-1)))
+ f.extend((1.0+g) * reduce(mul, (cos(0.5*xi*pi) for xi in xc[:m]), 1) *
sin(0.5*xc[m]*pi) for m in range(obj-2, -1, -1))
+
return f
def dtlz3(individual, obj):
@@ -545,7 +546,7 @@
xm = individual[obj-1:]
g = 100 * (len(xm) + sum((xi-0.5)**2 - cos(20*pi*(xi-0.5)) for xi in
xm))
f = [(1.0+g) * reduce(mul, (cos(0.5*xi*pi) for xi in xc), 1.0)]
- f.extend((1.0+g) * reduce(mul, (cos(0.5*xi*pi) for xi in xc[:m-1]), 1)
* sin(0.5*xc[m]*pi) for m in reversed(xrange(obj-1)))
+ f.extend((1.0+g) * reduce(mul, (cos(0.5*xi*pi) for xi in xc[:m]), 1) *
sin(0.5*xc[m]*pi) for m in range(obj-2, -1, -1))
return f
def dtlz4(individual, obj, alpha):
@@ -574,7 +575,7 @@
xm = individual[obj-1:]
g = sum((xi-0.5)**2 for xi in xm)
f = [(1.0+g) * reduce(mul, (cos(0.5*xi**alpha*pi) for xi in xc), 1.0)]
- f.extend((1.0+g) * reduce(mul, (cos(0.5*xi**alpha*pi) for xi in
xc[:m-1]), 1) * sin(0.5*xc[m]**alpha*pi) for m in reversed(xrange(obj-1)))
+ f.extend((1.0+g) * reduce(mul, (cos(0.5*xi**alpha*pi) for xi in
xc[:m]), 1) * sin(0.5*xc[m]**alpha*pi) for m in range(obj-2, -1, -1))
return f
def fonseca(individual):
==============================================================================
Revision: 5a6950ce51cd
Branch: dev
Author: felix.antoine.fortin
Date: Tue Apr 8 20:52:45 2014 UTC
Log: Add EDA examples.
http://code.google.com/p/deap/source/detail?r=5a6950ce51cd
Modified:
/examples/speed.txt
=======================================
--- /examples/speed.txt Sat Nov 23 07:19:45 2013 UTC
+++ /examples/speed.txt Tue Apr 8 20:52:45 2014 UTC
@@ -31,7 +31,8 @@
coev/coop_adapt
de/basic
de/sphere
-eda/fctmin
+eda/emna
+eda/emnag
eda/pbil
pso/basic
pso/speciation
==============================================================================
Revision: d47fb279ba1d
Branch: default
Author: felix.antoine.fortin
Date: Tue Apr 8 20:52:13 2014 UTC
Log: Fix implementation bug in DTLZ2, DTLZ3 and DTLZ4.
http://code.google.com/p/deap/source/detail?r=d47fb279ba1d
Modified:
/deap/benchmarks/__init__.py
=======================================
--- /deap/benchmarks/__init__.py Thu May 10 21:40:18 2012 UTC
+++ /deap/benchmarks/__init__.py Tue Apr 8 20:52:13 2014 UTC
@@ -518,7 +518,8 @@
xm = individual[obj-1:]
g = sum((xi-0.5)**2 for xi in xm)
f = [(1.0+g) * reduce(mul, (cos(0.5*xi*pi) for xi in xc), 1.0)]
- f.extend((1.0+g) * reduce(mul, (cos(0.5*xi*pi) for xi in xc[:m-1]), 1)
* sin(0.5*xc[m]*pi) for m in reversed(xrange(obj-1)))
+ f.extend((1.0+g) * reduce(mul, (cos(0.5*xi*pi) for xi in xc[:m]), 1) *
sin(0.5*xc[m]*pi) for m in range(obj-2, -1, -1))
+
return f
def dtlz3(individual, obj):
@@ -545,7 +546,7 @@
xm = individual[obj-1:]
g = 100 * (len(xm) + sum((xi-0.5)**2 - cos(20*pi*(xi-0.5)) for xi in
xm))
f = [(1.0+g) * reduce(mul, (cos(0.5*xi*pi) for xi in xc), 1.0)]
- f.extend((1.0+g) * reduce(mul, (cos(0.5*xi*pi) for xi in xc[:m-1]), 1)
* sin(0.5*xc[m]*pi) for m in reversed(xrange(obj-1)))
+ f.extend((1.0+g) * reduce(mul, (cos(0.5*xi*pi) for xi in xc[:m]), 1) *
sin(0.5*xc[m]*pi) for m in range(obj-2, -1, -1))
return f
def dtlz4(individual, obj, alpha):
@@ -574,7 +575,7 @@
xm = individual[obj-1:]
g = sum((xi-0.5)**2 for xi in xm)
f = [(1.0+g) * reduce(mul, (cos(0.5*xi**alpha*pi) for xi in xc), 1.0)]
- f.extend((1.0+g) * reduce(mul, (cos(0.5*xi**alpha*pi) for xi in
xc[:m-1]), 1) * sin(0.5*xc[m]**alpha*pi) for m in reversed(xrange(obj-1)))
+ f.extend((1.0+g) * reduce(mul, (cos(0.5*xi**alpha*pi) for xi in
xc[:m]), 1) * sin(0.5*xc[m]**alpha*pi) for m in range(obj-2, -1, -1))
return f
def fonseca(individual):
==============================================================================
Revision: ff1674736026
Branch: default
Author: felix.antoine.fortin
Date: Tue Apr 8 20:53:19 2014 UTC
Log: Merge.
http://code.google.com/p/deap/source/detail?r=ff1674736026
==============================================================================
Revision: db57688c6ec3
Branch: dev
Author: felix.antoine.fortin
Date: Tue Apr 8 20:53:42 2014 UTC
Log: Merge.
http://code.google.com/p/deap/source/detail?r=db57688c6ec3