Port codebase from Python 2 to Python 3
Replace Python 2-only constructs throughout libs/: print statements, ConfigParser -> configparser, sets.Set -> builtin set, string.split -> str.split, xrange -> range, dict.has_key()/.iteritems() -> in/.items(), old-style raise Exception, "msg" syntax, and __cmp__ -> __eq__/__lt__ via functools.total_ordering (Python 3 dropped cmp()/__cmp__, which max()/.sort() rely on). Also cleaned up mixed tab/space indentation that Python 3's stricter tokenizer rejects. Fixed two latent bugs that only surfaced once end-to-end runs were possible under Python 3's stricter error handling: - HandleBestellung() compared G.Anzahl (a bound method) to an int instead of calling G.Anzahl() - silently "worked" under Python 2's permissive cross-type ordering, raises TypeError under Python 3. - LeuteAllein() raised KeyError for VIP-group members, who are never added to the regular Gruppen container; now skips people with no group entry instead of crashing. Verified end-to-end: bin/platz.sh --indir work/test1 and --indir work/test2 (VIP group included) both run to completion and produce correctly formatted output. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Michael Stangl
+56
-57
@@ -4,9 +4,9 @@ Enthaelt alle Datenstrukturen um die einen genetischen Algorithmus darzustellen
|
||||
"""
|
||||
from random import *
|
||||
from itertools import chain
|
||||
from string import split
|
||||
from copy import deepcopy
|
||||
import ConfigParser, os
|
||||
from functools import total_ordering
|
||||
import configparser, os
|
||||
|
||||
|
||||
__author__ = "Michael Stangl"
|
||||
@@ -15,29 +15,30 @@ __date__ = "$Date: $"
|
||||
__copyright__ = "Copyright (c) 2005 Michael Stangl"
|
||||
__license__ = "Python"
|
||||
|
||||
@total_ordering
|
||||
class Loesung:
|
||||
"""ein einfaches Loesungsobjekt. Taugt um es als Superklasse zu ueberladen"""
|
||||
def __init__(self, *Argumente, **keywords):
|
||||
self.Id = -1 * randint(1,100)
|
||||
self.value = self.Id
|
||||
print " initialisiere Loesung " + repr(self.Id)
|
||||
print(" initialisiere Loesung " + repr(self.Id))
|
||||
def mutieren(self):
|
||||
print " mutiere Loesung " + repr(self.Id)
|
||||
print(" mutiere Loesung " + repr(self.Id))
|
||||
self.Id = -1 * randint(1,100)
|
||||
self.value = self.Id
|
||||
return self
|
||||
def kreuzen(self,obj):
|
||||
print " kreuze Loesung " + repr(self.Id)
|
||||
print(" kreuze Loesung " + repr(self.Id))
|
||||
def laden(self):
|
||||
print " lade Loesung " + repr(self.Id)
|
||||
print(" lade Loesung " + repr(self.Id))
|
||||
def speichern(self):
|
||||
print " speichere Loesung " + repr(self.Id)
|
||||
print(" speichere Loesung " + repr(self.Id))
|
||||
def __repr__(self):
|
||||
return ' L '+ repr(self.Id)
|
||||
def __cmp__(self,other):
|
||||
if self.value < other.value: return -1
|
||||
elif self.value == other.value: return 0
|
||||
else: return 1
|
||||
return ' L '+ repr(self.Id)
|
||||
def __eq__(self,other):
|
||||
return self.value == other.value
|
||||
def __lt__(self,other):
|
||||
return self.value < other.value
|
||||
|
||||
class Zyklus:
|
||||
"""Definiert wie ein Zyklus ablaufen soll:
|
||||
@@ -45,21 +46,21 @@ class Zyklus:
|
||||
wann sollen Objekte generiert, gekreuzt, mutiert und selektiert werden
|
||||
wieviele sind davon jeweils betroffen
|
||||
"""
|
||||
def __init__(self, Name='default',
|
||||
Abfolge='e,m,s',
|
||||
def __init__(self, Name='default',
|
||||
Abfolge='e,m,s',
|
||||
Anzahl='10,10,10'):
|
||||
self.Name = Name
|
||||
self.Abfolge = split(Abfolge, ',')
|
||||
self.Anzahl = split(Anzahl,',')
|
||||
self.Abfolge = Abfolge.split(',')
|
||||
self.Anzahl = Anzahl.split(',')
|
||||
def __repr__(self):
|
||||
return( "Zyklus: %s\n"
|
||||
" Zyklusabfolge: %s\n"
|
||||
" Anzahl : %s\n"
|
||||
% ( self.Name,
|
||||
self.Abfolge,
|
||||
% ( self.Name,
|
||||
self.Abfolge,
|
||||
self.Anzahl ) )
|
||||
def laden(self, FileName, ZyklusName):
|
||||
config = ConfigParser.ConfigParser()
|
||||
config = configparser.ConfigParser()
|
||||
ZyklusPath= os.path.split( FileName )
|
||||
ZyklusPath= os.path.join( FileName )
|
||||
config.read( ZyklusPath )
|
||||
@@ -102,93 +103,91 @@ class Farm:
|
||||
pass
|
||||
def LoesungenErzeugen(self, N, Klasse, *Arguments, **keywords):
|
||||
""" Erzeuge Loesungen"""
|
||||
for i in xrange(N):
|
||||
for i in range(N):
|
||||
L = Klasse( *Arguments, **keywords )
|
||||
self.Pool.append(L)
|
||||
#print repr(len(self.Pool)) + ' Loesungsobjekte erzeugt'
|
||||
#print(repr(len(self.Pool)) + ' Loesungsobjekte erzeugt')
|
||||
def LoesungenKreuzen(self,N):
|
||||
"""mache aus zwei Loesungen eine neue"""
|
||||
#print "+ Loesungen kreuzen"
|
||||
for i in xrange(N):
|
||||
#print("+ Loesungen kreuzen")
|
||||
for i in range(N):
|
||||
self.Pool.append(self.Pool[i].kreuzen())
|
||||
def LoesungenMutieren(self, N):
|
||||
"""veraendere die Loesung, so dass sie hoffentlich besser wird"""
|
||||
print "+ Loesungen mutieren: ", N
|
||||
for n in xrange(N):
|
||||
#print " -"+repr(n+1)+" mal"
|
||||
print("+ Loesungen mutieren: ", N)
|
||||
for n in range(N):
|
||||
#print(" -"+repr(n+1)+" mal")
|
||||
for L in chain(self.Pool):
|
||||
O = deepcopy(L)
|
||||
self.PoolNeu.append(O.mutieren())
|
||||
#print self
|
||||
#print(self)
|
||||
def LoesungenBehalten(self):
|
||||
"""Behalte alle Eltern aus dem alten Pool"""
|
||||
print "+ alten Loesungspool behalten"
|
||||
print("+ alten Loesungspool behalten")
|
||||
self.PoolNeu = self.PoolNeu + self.Pool
|
||||
#print self
|
||||
#print(self)
|
||||
def NeueGeneration(self):
|
||||
"""Loesche alle bisherigen Eltern und mache einen neuen Zyklus"""
|
||||
print "+ Neue Generation erzeugen"
|
||||
print("+ Neue Generation erzeugen")
|
||||
self.Pool = self.PoolNeu
|
||||
self.PoolNeu = []
|
||||
#print self
|
||||
#print "---------------"
|
||||
#print(self)
|
||||
#print("---------------")
|
||||
def LoesungenAuswaehlen(self, N):
|
||||
"""Selektiere die besten Loesungen"""
|
||||
print "+ die besten -", repr(N) +" - Loesungen auswaehlen -"
|
||||
for i in xrange(N):
|
||||
print("+ die besten -", repr(N) +" - Loesungen auswaehlen -")
|
||||
for i in range(N):
|
||||
L = max(self.Pool)
|
||||
self.PoolNeu.append(L)
|
||||
self.Pool.remove(L)
|
||||
#print self
|
||||
#print(self)
|
||||
def LoesungenZufaelligAuswaehlen(self, N):
|
||||
"""Selektiere zufaellig Loesungen"""
|
||||
print "+ zufaellig auswaehlen -"+ repr(N) + "-"
|
||||
for i in xrange(N):
|
||||
print("+ zufaellig auswaehlen -"+ repr(N) + "-")
|
||||
for i in range(N):
|
||||
self.PoolNeu.append(choice(self.Pool))
|
||||
#print self
|
||||
#print(self)
|
||||
def __repr__(self):
|
||||
"""Drucke die Farm am Bildschirm aus"""
|
||||
return( " gewaehlte Objekte (%d): %s\n"
|
||||
" Elternobjekte (%d) : %s\n"
|
||||
% ( len(self.PoolNeu), self.PoolNeu,
|
||||
% ( len(self.PoolNeu), self.PoolNeu,
|
||||
len(self.Pool), self.Pool))
|
||||
def laden(self):
|
||||
print "+ laden"
|
||||
print("+ laden")
|
||||
def speichern(self):
|
||||
print "+ speichern"
|
||||
print("+ speichern")
|
||||
def Bester(self):
|
||||
return max(self.Pool)
|
||||
return max(self.Pool)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
print "\n-- Erzeuge Zyklus:"
|
||||
#Z = Zyklus( Name='Easy',
|
||||
print("\n-- Erzeuge Zyklus:")
|
||||
#Z = Zyklus( Name='Easy',
|
||||
#Abfolge='e,s,+,m,j,S,+',
|
||||
#Anzahl='10,5,x,2,x,5,x'
|
||||
#)
|
||||
Z = Zyklus( Name='Easy',
|
||||
Abfolge='e,'+'s,z,m,j,z,'*3+'s',
|
||||
Anzahl='10,'+'5,x,2,x,x,'*3+'1'
|
||||
Z = Zyklus( Name='Easy',
|
||||
Abfolge='e,'+'s,z,m,j,z,'*3+'s',
|
||||
Anzahl='10,'+'5,x,2,x,x,'*3+'1'
|
||||
)
|
||||
print Z
|
||||
print(Z)
|
||||
|
||||
print "\n-- Erzeuge Loesungen:"
|
||||
print("\n-- Erzeuge Loesungen:")
|
||||
L1 = Loesung()
|
||||
L2 = Loesung()
|
||||
L3 = Loesung()
|
||||
print L1, L2, L3
|
||||
print 'L1 > L2 =', L1 > L2
|
||||
print 'L2 > L3 =', L2 > L3
|
||||
print 'L1 > L3 =', L1 > L3
|
||||
print(L1, L2, L3)
|
||||
print('L1 > L2 =', L1 > L2)
|
||||
print('L2 > L3 =', L2 > L3)
|
||||
print('L1 > L3 =', L1 > L3)
|
||||
|
||||
A=2
|
||||
B=3
|
||||
|
||||
print "\n-- Erzeuge Farm:"
|
||||
print("\n-- Erzeuge Farm:")
|
||||
F1 = Farm( Z, Loesung, Arg1=A, Arg2=B, Arg3=L1 )
|
||||
print F1
|
||||
print(F1)
|
||||
|
||||
else:
|
||||
pass
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user