made a simplex class, going to move this into the face class to simplify

This commit is contained in:
Stephen Mardson McQuay 2010-02-21 19:02:45 -07:00
parent 6c4c6d4cfe
commit 0ef6897aee
4 changed files with 40 additions and 33 deletions

View File

@ -1,28 +0,0 @@
#!/usr/bin/python
import sys
import pickle
from grid import simple_rect_grid, simple_random_grid
pfile = '/tmp/grid_random.p'
qfile = '/tmp/grid_random.txt'
MAX_POINTS = 200
if __name__ == '__main__':
sys.setrecursionlimit(4096)
print sys.getrecursionlimit()
try:
total_points = int(sys.argv[1])
except:
total_points = 10
if total_points > MAX_POINTS:
print "too many points"
sys.exit(1)
g = simple_random_grid(total_points)
g.construct_connectivity()
print g
open(qfile, 'w').write(g.for_qhull())
pickle.dump(g, open(pfile, 'w'))

View File

@ -5,7 +5,6 @@ import pickle
from grid import simple_rect_grid, simple_random_grid
pfile = '/tmp/grid_regular.p'
qfile = '/tmp/grid_regular.txt'
if __name__ == '__main__':
@ -17,6 +16,6 @@ if __name__ == '__main__':
resolution = 3
g = simple_rect_grid(resolution, resolution)
g.construct_connectivity()
print g
print g.get_points_conn([0.4, 0])
open(qfile, 'w').write(g.for_qhull())
pickle.dump(g, open(pfile, 'w'))

View File

@ -7,7 +7,7 @@ from collections import defaultdict
import numpy as np
import scipy.spatial
from baker import run_baker
from baker import run_baker, get_phis
from tools import exact_func
from smcqdelaunay import *
@ -32,6 +32,28 @@ class face(object):
", ".join(neighbors)
)
class simplex(object):
def __init__(self, points):
self.R = points
def contains(self, X):
phis = get_phis(X, self.R)
r = True
if [i for i in phis if i < 0.0]:
r = False
return r
def __str__(self):
print type(self.R)
return "simplex: %d: [%s]" % (len(self.R), ", ".join([str(i) for i in self.R]),)
class grid(object):
facet_re = re.compile(r'''
-\s+(?P<facet>f\d+).*?
@ -89,6 +111,20 @@ class grid(object):
(R, S) = self.get_simplex_and_nearest_points(X)
return run_baker(X, R, S)
def get_points_conn(self, X):
if not self.faces:
self.construct_connectivity()
(dist, indicies) = self.tree.query(X, 3)
print dist, indicies, [(self.points[i][0], self.points[i][1]) for i in indicies]
print [i.name for i in self.facets_for_point[indicies[0]]]
print self.facets_for_point[indicies[0]]
smplx = simplex([self.points[i] for i in indicies])
if not smplx.contains(X):
raise AssertionError('simplex should contain point')
def construct_connectivity(self):
"""
a call to this method prepares the internal connectivity structure.