Update 2015 / 07 14:31

This commit is contained in:
2024-11-10 14:32:07 +01:00
parent 8e7c56e1b8
commit b15a2a38b8

View File

@@ -15,41 +15,29 @@ path = getPath2Data(aocDay,aocYear)
filename = getFilename2Data(aocDay) filename = getFilename2Data(aocDay)
def calculateWire(defWire,calculationSteps,valueWire): def calculateWire(defWire,calculationSteps,valueWire):
retVal = 0
try: try:
retVal = int(defWire) return int(defWire)
return retVal,valueWire
except ValueError: except ValueError:
pass pass
if defWire not in valueWire: if defWire not in valueWire:
calculationStep = calculationSteps[defWire] calculationStep = calculationSteps[defWire]
if len(calculationStep) == 1: if len(calculationStep) == 1:
calculateValueA, valueWire = calculateWire(calculationStep[0],calculationSteps,valueWire) retVal = calculateWire(calculationStep[0],calculationSteps,valueWire)
retVal = calculateValueA
else: else:
calc = calculationStep[-2] calc = calculationStep[-2]
if calc == 'AND': if calc == 'AND':
calculateValueA, valueWire = calculateWire(calculationStep[0],calculationSteps,valueWire) retVal = calculateWire(calculationStep[0],calculationSteps,valueWire) & calculateWire(calculationStep[2],calculationSteps,valueWire)
calculateValueB, valueWire = calculateWire(calculationStep[2],calculationSteps,valueWire)
retVal = calculateValueA & calculateValueB
elif calc == 'OR': elif calc == 'OR':
calculateValueA, valueWire = calculateWire(calculationStep[0],calculationSteps,valueWire) retVal = calculateWire(calculationStep[0],calculationSteps,valueWire) | calculateWire(calculationStep[2],calculationSteps,valueWire)
calculateValueB, valueWire = calculateWire(calculationStep[2],calculationSteps,valueWire)
retVal = calculateValueA | calculateValueB
elif calc == 'NOT': elif calc == 'NOT':
calculateValueA, valueWire = calculateWire(calculationStep[1],calculationSteps,valueWire) retVal = 0xffff - calculateWire(calculationStep[1],calculationSteps,valueWire)
retVal = 0xffff - calculateValueA
elif calc == 'RSHIFT': elif calc == 'RSHIFT':
calculateValueA, valueWire = calculateWire(calculationStep[0],calculationSteps,valueWire) retVal = calculateWire(calculationStep[0],calculationSteps,valueWire) >> calculateWire(calculationStep[2],calculationSteps,valueWire)
calculateValueB, valueWire = calculateWire(calculationStep[2],calculationSteps,valueWire)
retVal = calculateValueA >> calculateValueB
elif calc == 'LSHIFT': elif calc == 'LSHIFT':
calculateValueA, valueWire = calculateWire(calculationStep[0],calculationSteps,valueWire) retVal = calculateWire(calculationStep[0],calculationSteps,valueWire) << calculateWire(calculationStep[2],calculationSteps,valueWire)
calculateValueB, valueWire = calculateWire(calculationStep[2],calculationSteps,valueWire)
retVal = calculateValueA << calculateValueB
valueWire[defWire] = retVal valueWire[defWire] = retVal
return valueWire[defWire],valueWire return valueWire[defWire]
def createCalcSteps(data): def createCalcSteps(data):
calculationSteps={} calculationSteps={}
@@ -59,26 +47,23 @@ def createCalcSteps(data):
return calculationSteps return calculationSteps
def taskA (data) -> int: def taskA (data) -> int:
global calculationSteps
gameScoreA = 0 gameScoreA = 0
calculationSteps=createCalcSteps(data) calculationSteps=createCalcSteps(data)
gameScoreA,valueWire = calculateWire('a',calculationSteps,{}) gameScoreA = calculateWire('a',calculationSteps,{})
return gameScoreA return gameScoreA
def taskB (data,valueA) -> int: def taskB (data) -> int:
gameScoreB = 0 gameScoreB = 0
calculationSteps=createCalcSteps(data) gameScoreB = calculateWire('a',calculationSteps,{'b':score})
gameScoreB,valueWire = calculateWire('a',calculationSteps,{'b':valueA})
return gameScoreB return gameScoreB
def task(task: int,data) -> int: def task(task: int,data) -> int:
global scoreA global score
global scoreB
score=0
if task == 1: if task == 1:
score = taskA(data) score = taskA(data)
scoreA=score
elif task == 2: elif task == 2:
score = taskB(data,scoreA) score = taskB(data)
return score return score
def main(): def main():