Skip to content

Commit

Permalink
Make the triangulation.py closer to the original
Browse files Browse the repository at this point in the history
  • Loading branch information
certik committed Apr 27, 2010
1 parent 91dccf6 commit ef7c7e6
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
10 changes: 5 additions & 5 deletions examples/triangulation.html
Expand Up @@ -127,6 +127,7 @@
function triangulate_af(pts_list, bdy_edges) {
"\n" + " Create a triangulation using the advancing front method.\n" + " ";
elems = list([]);
bdy_edges = bdy_edges.__getitem__(slice(null));
while (len(bdy_edges) > 0) {
var __dummy0__ = bdy_edges.pop();
a = __dummy0__.__getitem__(0);
Expand Down Expand Up @@ -189,17 +190,16 @@
function example1() {
var __dummy0__ = example2();
nodes = __dummy0__.__getitem__(0);
s1 = __dummy0__.__getitem__(1);
edges = __dummy0__.__getitem__(1);
elems = __dummy0__.__getitem__(2);
result = ((((str(nodes))+("\n" + ""))+(s1))+("\n" + ""))+(str(elems));
result = ((((str(nodes))+("\n" + ""))+(str(edges)))+("\n" + ""))+(str(elems));
return result;
}
function example2() {
nodes = list([tuple([0, 0]), tuple([1, 0]), tuple([2, 1]), tuple([2, 2]), tuple([1, 2]), tuple([0.5, 1.5]), tuple([0, 1])]);
edges = list([tuple([0, 1]), tuple([1, 2]), tuple([2, 3]), tuple([3, 4]), tuple([4, 5]), tuple([5, 0])]);
s1 = str(edges);
elems = triangulate_af(nodes,edges);
return tuple([nodes, s1, elems]);
return tuple([nodes, edges, elems]);
}
function start_triag() {
js_pre = document.getElementById("js_pre");
Expand All @@ -210,7 +210,7 @@
js_pre.textContent = example1();
var __dummy0__ = example2();
nodes = __dummy0__.__getitem__(0);
s1 = __dummy0__.__getitem__(1);
edges = __dummy0__.__getitem__(1);
elems = __dummy0__.__getitem__(2);
scale = 50;
x0 = 3;
Expand Down
11 changes: 5 additions & 6 deletions examples/triangulation.py
Expand Up @@ -78,7 +78,7 @@ def triangulate_af(pts_list, bdy_edges):
"""
# create empty list of elements
elems = []
#bdy_edges = bdy_edges[:]
bdy_edges = bdy_edges[:]
# main loop
while len(bdy_edges) > 0:
# take the last item from the list of bdy edges (and remove it)
Expand Down Expand Up @@ -137,7 +137,7 @@ def start_triag():
canvas.fillText("Mesh", 100, 10)
js_pre.textContent = "triag"
js_pre.textContent = example1()
nodes, s1, elems = example2()
nodes, edges, elems = example2()
scale = 50
x0 = 3
canvas.strokeStyle = 'rgb(0, 0, 255)'
Expand Down Expand Up @@ -165,8 +165,8 @@ def start_triag():

@JavaScript
def example1():
nodes, s1, elems = example2()
result = str(nodes) + "\n" + s1 + "\n" + str(elems)
nodes, edges, elems = example2()
result = str(nodes) + "\n" + str(edges) + "\n" + str(elems)
return result

@JavaScript
Expand All @@ -181,9 +181,8 @@ def example2():
(0, 1),
]
edges = [(0, 1), (1, 2), (2, 3), (3, 4), (4, 5), (5, 0)]
s1 = str(edges)
elems = triangulate_af(nodes, edges)
return nodes, s1, elems
return nodes, edges, elems


def main():
Expand Down

0 comments on commit ef7c7e6

Please sign in to comment.