Projects/laydi
Projects
/
laydi
Archived
7
0
Fork 0
Code Issues Pull Requests Activity

added validation on identifiers input

This commit is contained in:
Arnar Flatberg 2007-03-14 16:06:16 +00:00
parent 51435d9fdc
commit 00dd3e8d9d
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fluents/dataset.py
View File

@ -42,20 +42,16 @@ class Dataset:
self._name = name self._name = name
self._identifiers = identifiers self._identifiers = identifiers
self._type = 'n' self._type = 'n'
if len(array.shape)==1: if len(array.shape)==1:
array = atleast_2d(asarray(array)) array = atleast_2d(asarray(array))
# vectors are column vectors # vectors are column vectors
if array.shape[0]==1: if array.shape[0]==1:
array = array.T array = array.T
self.shape = array.shape self.shape = array.shape
if identifiers!=None: if identifiers!=None:
identifier_shape = [len(i[1]) for i in identifiers] self._validate_identifiers(identifiers)
if len(identifier_shape)!=len(self.shape):
raise ValueError, "Identifier list length must equal array dims"
for ni, na in zip(identifier_shape, self.shape):
if ni!=na:
raise ValueError, "identifier-array mismatch in %s: (idents: %s, array: %s)" %(self._name, ni, na)
self._set_identifiers(identifiers, self._all_dims) self._set_identifiers(identifiers, self._all_dims)
else: else:
self._identifiers = self._create_identifiers(self.shape, self._all_dims) self._identifiers = self._create_identifiers(self.shape, self._all_dims)
@ -157,8 +153,8 @@ class Dataset:
given dim. Index (Indices) are the Identifiers position in a given dim. Index (Indices) are the Identifiers position in a
matrix in a given dim. matrix in a given dim.
""" """
if indices!=None: if indices != None:
if len(indices)==0:# if empty list or empty array if len(indices) == 0:# if empty list or empty array
return [] return []
if indices != None: if indices != None:
@ -166,7 +162,7 @@ class Dataset:
#indices = intersect1d(self.get_indices(dim),indices) #indices = intersect1d(self.get_indices(dim),indices)
ids = [self._map[dim].reverse[i] for i in indices] ids = [self._map[dim].reverse[i] for i in indices]
else: else:
if sorted==True: if sorted == True:
ids = [self._map[dim].reverse[i] for i in array_sort(self._map[dim].values())] ids = [self._map[dim].reverse[i] for i in array_sort(self._map[dim].values())]
else: else:
ids = self._map[dim].keys() ids = self._map[dim].keys()
@ -197,7 +193,18 @@ class Dataset:
""" """
return copy.deepcopy(self) return copy.deepcopy(self)
def _validate_identifiers(self, identifiers):
for dim_name, ids in identifiers:
if len(set(ids)) != len(ids):
raise ValueError("Identifiers not unique in : %s" %dim_name)
identifier_shape = [len(i[1]) for i in identifiers]
if len(identifier_shape)!=len(self.shape):
raise ValueError("Identifier list length must equal array dims")
for ni, na in zip(identifier_shape, self.shape):
if ni != na:
raise ValueError, "Identifier-array mismatch: %s: (idents: %s, array: %s)" %(self._name, ni, na)
class CategoryDataset(Dataset): class CategoryDataset(Dataset):
"""The category dataset class. """The category dataset class.
@ -490,4 +497,3 @@ def read_ftsv(fd):
return ds return ds