moderate: cleaned up file, used library funcs

This commit is contained in:
Stephen McQuay 2011-03-21 12:13:46 -06:00
parent 75806a1377
commit 6234f8ffe8

View File

@ -7,29 +7,15 @@ import numpy as np
import interp.bootstrap import interp.bootstrap
from interp.grid.gmsh import gmsh_grid3D from interp.grid.gmsh import gmsh_grid3D
from interp.tools import improved_answer, log, exact from interp.tools import improved_answer, exact
from interp.grid import grid def test_success(input_file, count):
g = gmsh_grid3D(input_file)
if __name__ == '__main__':
if len(sys.argv) != 2:
print >> sys.stderr, "usage: %s <gmsh file>" % sys.argv[0]
sys.exit(1)
g = gmsh_grid3D(sys.argv[1])
g.q = np.array([exact(x) for x in g.verts]) g.q = np.array([exact(x) for x in g.verts])
X = np.array([0.2, 0.5, 0.01])
R = g.get_containing_simplex(X)
R, S = g.get_simplex_and_nearest_points(X, 10)
print R
print "r", R
print "s", S
results = {True:0, False:0} results = {True:0, False:0}
# import pdb; pdb.set_trace() # import pdb; pdb.set_trace()
for i in xrange(1000): for i in xrange(count):
X = np.random.random((1,3))[0] X = np.random.random((1,3))[0]
a = g.run_baker(X, order = 3, extra_points = 32) a = g.run_baker(X, order = 3, extra_points = 32)
@ -37,8 +23,13 @@ if __name__ == '__main__':
results[improved_answer(a, e)] += 1 results[improved_answer(a, e)] += 1
print results return results
# g.normalize_q()
# print g.toxml()
igg = grid(g.verts, g.q) if __name__ == '__main__':
if len(sys.argv) != 3:
print >> sys.stderr, "usage: %s <input file> <number of attempts>" % sys.argv[0]
sys.exit(1)
input_file, count = sys.argv[1:]
print test_success(input_file, int(count))