sm/smbinterp
1
0
Fork 0
Code Issues Pull Requests Activity

updated the interp.grid.DD module to count points correctly

Browse Source
This commit is contained in:
Stephen McQuay 2011-05-20 18:06:42 -06:00
parent 5ef402982c
commit 985a16bb22
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
interp/grid/DD.py
View File

@ -30,33 +30,28 @@ class rect_grid(basegrid):
class random_grid(rect_grid): class random_grid(rect_grid):
def __init__(self, num_verts = 10): def __init__(self, num_verts = 10):
verts = [] verts = []
q = []
r = np.random
appx_side_res = int(np.sqrt(num_verts)) appx_side_res = int(np.sqrt(num_verts))
delta = 1.0 / float(appx_side_res) delta = 1.0 / float(appx_side_res)
for x in xrange(appx_side_res + 1): verts.append([0,0])
verts.append([1,0])
verts.append([0,1])
verts.append([1,1])
for x in xrange(1,appx_side_res):
cur_x = x * delta cur_x = x * delta
for cur_y in (0, 1): for cur_y in (0, 1):
new_point = [cur_x, cur_y] new_point = [cur_x, cur_y]
verts.append(new_point) verts.append(new_point)
q.append(exact_func(new_point))
for y in xrange(appx_side_res + 1): for y in xrange(1,appx_side_res):
cur_y = y * delta cur_y = y * delta
for cur_x in (0, 1): for cur_x in (0, 1):
new_point = [cur_x, cur_y] new_point = [cur_x, cur_y]
verts.append(new_point) verts.append(new_point)
q.append(exact_func(new_point))
for i in xrange(num_verts): verts.extend(np.random.random((num_verts - 4*appx_side_res, 2)))
cur_x = r.rand()
cur_y = r.rand()
verts.append([cur_x, cur_y]) q = np.zeros(len(verts))
q.append( exact_func( (cur_x, cur_y) ) ) basegrid.__init__(self, np.array(verts), q)
basegrid.__init__(self, verts, q)
self.verts = np.array(self.verts)
self.q = np.array(self.q)