From 82861e80bc9c8d4193f35883118fcfe15a99e124 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 17 Nov 2018 08:46:58 +0100 Subject: [PATCH] more python3 related changes --- PRIVATE | 2 +- processing/pre/seeds_fromGeom.py | 6 +++--- processing/pre/seeds_fromPokes.py | 2 +- processing/pre/seeds_fromRandom.py | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/PRIVATE b/PRIVATE index 923e5eaa2..6994385eb 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 923e5eaa2a24b0ac3b9b66e62394784596643d16 +Subproject commit 6994385eb1eef00d9f35f047dc3c8a6382c3f41b diff --git a/processing/pre/seeds_fromGeom.py b/processing/pre/seeds_fromGeom.py index 97d8615a1..889ef6146 100755 --- a/processing/pre/seeds_fromGeom.py +++ b/processing/pre/seeds_fromGeom.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys @@ -42,8 +42,8 @@ parser.set_defaults(whitelist = [], (options,filenames) = parser.parse_args() -options.whitelist = map(int,options.whitelist) -options.blacklist = map(int,options.blacklist) +options.whitelist = list(map(int,options.whitelist)) +options.blacklist = list(map(int,options.blacklist)) # --- loop over output files ------------------------------------------------------------------------- diff --git a/processing/pre/seeds_fromPokes.py b/processing/pre/seeds_fromPokes.py index 3e831e906..08e600ffe 100755 --- a/processing/pre/seeds_fromPokes.py +++ b/processing/pre/seeds_fromPokes.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,math,sys diff --git a/processing/pre/seeds_fromRandom.py b/processing/pre/seeds_fromRandom.py index 77bacdc8e..c1a7cbd4d 100755 --- a/processing/pre/seeds_fromRandom.py +++ b/processing/pre/seeds_fromRandom.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python3 # -*- coding: UTF-8 no BOM -*- import os,sys,math,random @@ -170,7 +170,7 @@ for name in filenames: dtype=int,casting='unsafe') # find max grid indices within fraction meshgrid = np.meshgrid(*map(np.arange,n),indexing='ij') # create a meshgrid within fraction coords = np.vstack((meshgrid[0],meshgrid[1],meshgrid[2])).reshape(3,n.prod()).T # assemble list of 3D coordinates - seeds = ((random.sample(coords,options.N)+np.random.random(options.N*3).reshape(options.N,3))\ + seeds = ((random.sample(list(coords),options.N)+np.random.random(options.N*3).reshape(options.N,3))\ / \ (n/options.fraction)).T # pick options.N of those, rattle position, # and rescale to fall within fraction