Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migration of the sumopy contributed tool from python 2.x to python 3 #10824

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+26,006 −3,302
Open

Migration of the sumopy contributed tool from python 2.x to python 3 #10824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
287ddca
migrate sumopy tool from python 2.x to python 3
vijay-jaisankar May 30, 2022
6b9178f
Merge branch 'main' into tool_migration
m-kro Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions tools/contributed/sumopy/agilepy/lib_base/arrayman.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# @author Joerg Schweizer
# @date 2012

from classman import *
from .classman import *
import numpy as np


Expand Down Expand Up @@ -494,7 +494,7 @@ def _write_xml_value(self, val, fd):
# don't even write empty lists
pass

elif type(self._default) in (types.UnicodeType, types.StringType):
elif type(self._default) in (str, bytes):
if len(val) > 0:
fd.write(xm.num(self.xmltag, val))

Expand Down Expand Up @@ -529,7 +529,7 @@ def init_postload_internal(self, man, obj):
AttrConf.init_postload_internal(self, man, obj)
# print 'IdsConf.init_postload_internal',self.attrname,self.get_value().dtype,self.get_value().dtype == np.int64
if self.get_value().dtype == np.int64:
print 'WARNING in init_postload_internal: convert ids array to 32 bit'
print('WARNING in init_postload_internal: convert ids array to 32 bit')
self.set_value(np.array(self.get_value(), dtype=np.int32))
# if self._is_child:
# print ' make sure children get initialized'
Expand Down Expand Up @@ -890,7 +890,7 @@ def get_ids(self, inds=None):
return

def __getitem__(self, args):
if type(args) == types.TupleType:
if type(args) == tuple:
attrnames = args[0]
ids = args[1]
else:
Expand All @@ -908,7 +908,7 @@ def __getitem__(self, args):
# TODO: detect dtype by adding numbers or use fields!!!
dtype = np.float32
out = np.zeros((n_rows, n_cols), dtype=dtype)
for i, attrname in zip(xrange(n_cols), attrnames):
for i, attrname in zip(range(n_cols), attrnames):
out[:, i] = getattr(self, attrname)[ids]
return out
else:
Expand Down Expand Up @@ -1052,7 +1052,7 @@ def add_rows(self, n=None, ids=[], **attrs):
ids = self.suggest_ids(n)
elif (len(ids) == 0) & (len(attrs) > 0):
# get number of rows from any value vector provided
ids = self.suggest_ids(len(attrs.values()[0]))
ids = self.suggest_ids(len(list(attrs.values())[0]))
elif (n is None) & (len(ids) == 0) & (len(attrs) > 0):
# nothing given really-> do nothing
return np.zeros((0), np.int)
Expand Down Expand Up @@ -1226,7 +1226,7 @@ def init_postload_internal(self, parent):
# this should no longer happen in the future as ind and ids
# have been formatted propperly
if attrman._inds.dtype != np.int32:
print 'WARNING: 64 bit ids and inds...will adjust to 32 bit'
print('WARNING: 64 bit ids and inds...will adjust to 32 bit')
attrman._inds = np.array(attrman._inds, dtype=np.int32)
attrman._ids = np.array(attrman._ids, dtype=np.int32)

Expand Down
Loading
Loading