diff options
Diffstat (limited to 'Demos/benchmarks')
| -rw-r--r-- | Demos/benchmarks/bpnn3.py | 6 | ||||
| -rw-r--r-- | Demos/benchmarks/chaos.py | 2 | ||||
| -rw-r--r-- | Demos/benchmarks/meteor_contest.py | 3 | ||||
| -rw-r--r-- | Demos/benchmarks/nqueens.py | 2 | ||||
| -rw-r--r-- | Demos/benchmarks/richards.py | 8 | ||||
| -rw-r--r-- | Demos/benchmarks/spectralnorm.py | 22 |
6 files changed, 21 insertions, 22 deletions
diff --git a/Demos/benchmarks/bpnn3.py b/Demos/benchmarks/bpnn3.py index 362bc2703..8498bd898 100644 --- a/Demos/benchmarks/bpnn3.py +++ b/Demos/benchmarks/bpnn3.py @@ -1,7 +1,7 @@ #!/usr/bin/python # Back-Propagation Neural Networks # -# Written in Python. See http://www.python.org/ +# Written in Python. See https://www.python.org/ # # Neil Schemenauer <nascheme@enme.ucalgary.ca> @@ -29,7 +29,7 @@ class NN(object): # print 'class NN' def __init__(self, ni, nh, no): # number of input, hidden, and output nodes - self.ni = ni + 1 # +1 for bias node + self.ni = ni + 1 # +1 for bias node self.nh = nh self.no = no @@ -67,7 +67,7 @@ class NN(object): for j in range(self.nh): sum = 0.0 for i in range(self.ni): - sum = sum + self.ai[i] * self.wi[i][j] + sum = sum + self.ai[i] * self.wi[i][j] self.ah[j] = 1.0/(1.0+math.exp(-sum)) # output activations diff --git a/Demos/benchmarks/chaos.py b/Demos/benchmarks/chaos.py index 36bd1bcd3..d770ff41c 100644 --- a/Demos/benchmarks/chaos.py +++ b/Demos/benchmarks/chaos.py @@ -130,7 +130,7 @@ class Spline(object): I = ii break else: - I = dom[1] - 1 + I = dom[1] - 1 return I def __len__(self): diff --git a/Demos/benchmarks/meteor_contest.py b/Demos/benchmarks/meteor_contest.py index 7eb6ca299..7610d5c08 100644 --- a/Demos/benchmarks/meteor_contest.py +++ b/Demos/benchmarks/meteor_contest.py @@ -64,7 +64,7 @@ def get_senh(board, cti): def get_puzzle(w=w, h=h): - board = [E*x + S*y + (y%2) for y in range(h) for x in range(w)] + board = [E*x + S*y + (y % 2) for y in range(h) for x in range(w)] cti = dict((board[i], i) for i in range(len(board))) idos = [[E, E, E, SE], # incremental direction offsets @@ -152,4 +152,3 @@ if __name__ == "__main__": options, args = parser.parse_args() util.run_benchmark(options, options.num_runs, main) - diff --git a/Demos/benchmarks/nqueens.py b/Demos/benchmarks/nqueens.py index 87e63df11..918f9e589 100644 --- a/Demos/benchmarks/nqueens.py +++ b/Demos/benchmarks/nqueens.py @@ -43,7 +43,7 @@ def permutations(iterable): else: return -# From http://code.activestate.com/recipes/576647/ +# From https://code.activestate.com/recipes/576647/ @cython.locals(queen_count=int, i=int, vec=list) def n_queens(queen_count): """N-Queens solver. diff --git a/Demos/benchmarks/richards.py b/Demos/benchmarks/richards.py index 913ec5daf..76a92c3a0 100644 --- a/Demos/benchmarks/richards.py +++ b/Demos/benchmarks/richards.py @@ -333,7 +333,7 @@ class WorkTask(Task): pkt.ident = dest pkt.datum = 0 - for i in BUFSIZE_RANGE: # range(BUFSIZE) + for i in BUFSIZE_RANGE: # range(BUFSIZE) w.count += 1 if w.count > 26: w.count = 1 @@ -382,9 +382,9 @@ class Richards(object): wkq = Packet(wkq , I_DEVB, K_DEV) HandlerTask(I_HANDLERB, 3000, wkq, TaskState().waitingWithPacket(), HandlerTaskRec()) - wkq = None; - DeviceTask(I_DEVA, 4000, wkq, TaskState().waiting(), DeviceTaskRec()); - DeviceTask(I_DEVB, 5000, wkq, TaskState().waiting(), DeviceTaskRec()); + wkq = None + DeviceTask(I_DEVA, 4000, wkq, TaskState().waiting(), DeviceTaskRec()) + DeviceTask(I_DEVB, 5000, wkq, TaskState().waiting(), DeviceTaskRec()) schedule() diff --git a/Demos/benchmarks/spectralnorm.py b/Demos/benchmarks/spectralnorm.py index 7b56b05f6..f476c6bcd 100644 --- a/Demos/benchmarks/spectralnorm.py +++ b/Demos/benchmarks/spectralnorm.py @@ -11,28 +11,28 @@ from time import time import util import optparse -def eval_A (i, j): +def eval_A(i, j): return 1.0 / ((i + j) * (i + j + 1) / 2 + i + 1) -def eval_A_times_u (u): +def eval_A_times_u(u): return [ part_A_times_u(i,u) for i in range(len(u)) ] -def eval_At_times_u (u): +def eval_At_times_u(u): return [ part_At_times_u(i,u) for i in range(len(u)) ] -def eval_AtA_times_u (u): - return eval_At_times_u (eval_A_times_u (u)) +def eval_AtA_times_u(u): + return eval_At_times_u(eval_A_times_u(u)) def part_A_times_u(i, u): partial_sum = 0 for j, u_j in enumerate(u): - partial_sum += eval_A (i, j) * u_j + partial_sum += eval_A(i, j) * u_j return partial_sum def part_At_times_u(i, u): partial_sum = 0 for j, u_j in enumerate(u): - partial_sum += eval_A (j, i) * u_j + partial_sum += eval_A(j, i) * u_j return partial_sum DEFAULT_N = 130 @@ -43,13 +43,13 @@ def main(n): t0 = time() u = [1] * DEFAULT_N - for dummy in range (10): - v = eval_AtA_times_u (u) - u = eval_AtA_times_u (v) + for dummy in range(10): + v = eval_AtA_times_u(u) + u = eval_AtA_times_u(v) vBv = vv = 0 - for ue, ve in zip (u, v): + for ue, ve in zip(u, v): vBv += ue * ve vv += ve * ve tk = time() |