Skip to content

Commit

Permalink
adj curve update
Browse files Browse the repository at this point in the history
  • Loading branch information
@jchilds0
jchilds0 committed Sep 26, 2023
1 parent 3a292ba commit f4c6644
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 22 deletions.
4 changes: 2 additions & 2 deletions dev/symplectic_basis/symplectic_basis_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ int main(void) {
int i, **eqns, num_rows, num_cols;
Triangulation *theTriangulation;

int fromFile = 1;
int fromFile = 0;

int count = 1;
int numTet[] = {5};
int index[] = {6};
int index[] = {4};

char *error[] = {
"CuspedCensusData/link-60819.tri", /* curve holonomy */
Expand Down
4 changes: 2 additions & 2 deletions dev/symplectic_basis/symplectic_basis_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ void testDual(void) {
for (j = index[i][1]; j < index[i][2]; j++) {
theTriangulation = GetCuspedCensusManifold("", index[i][0], oriented_manifold, j);

if (get_orientability(theTriangulation) == nonorientable_manifold)
if (get_orientability(theTriangulation) == nonorientable_manifold || get_num_cusps(theTriangulation) > 1)
continue;

printf("Num Tet: %d Index: %d \n", index[i][0], j);

basis = get_symplectic_basis(theTriangulation, &dual_rows, &dual_cols, 1);
basis = get_symplectic_basis(theTriangulation, &dual_rows, &dual_cols, 0);

for (k = 0; 2 * k + 1 < dual_rows; k++) {
retval1 = ABS(omega(basis[2 * k], basis[2 * k + 1], dual_cols));
Expand Down
43 changes: 25 additions & 18 deletions kernel/kernel_code/symplectic_basis.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ CurveComponent *setup_first_curve_component(CuspStructure *, EndMultiGr
CurveComponent *setup_last_curve_component(CuspStructure *, EndMultiGraph *, CuspEndPoint *, CurveComponent *, CurveComponent *);
void do_curve_component_to_new_edge_class(CuspStructure *, CurveComponent *);
void find_single_endpoint(CuspStructure *, PathEndPoint *, int, int);
void find_single_matching_endpoint(CuspStructure *, PathEndPoint *, PathEndPoint *, int, int);
void find_single_matching_endpoint(CuspStructure *, PathEndPoint *, PathEndPoint *);

void graph_path_to_dual_curve(CuspStructure *, EdgeNode *, EdgeNode *, PathNode *, PathNode *, PathEndPoint *, PathEndPoint *);
void endpoint_edge_node_to_path_node(CuspRegion *, PathNode *, EdgeNode *, PathEndPoint *, int);
Expand Down Expand Up @@ -1983,19 +1983,12 @@ CurveComponent *setup_first_curve_component(CuspStructure *cusp, EndMultiGraph *
CurveComponent *setup_last_curve_component(CuspStructure *cusp, EndMultiGraph *multi_graph, CuspEndPoint *endpoint,
CurveComponent *curves_begin, CurveComponent *curves_end) {
CurveComponent *path;
path = init_curve_component(endpoint->edge_class[FINISH], endpoint->edge_class[START], endpoint->cusp_index);
path = init_curve_component(endpoint->edge_class[START], endpoint->edge_class[FINISH], endpoint->cusp_index);
INSERT_BEFORE(path, curves_end);

construct_cusp_region_dual_graph(cusp);
find_single_matching_endpoint(cusp,
&curves_begin->next->endpoints[START],
&path->endpoints[START],
path->edge_class[START], FINISH);

find_single_matching_endpoint(cusp,
&path->prev->endpoints[FINISH],
&path->endpoints[FINISH],
path->edge_class[FINISH], FINISH);
find_single_matching_endpoint(cusp, &curves_begin->next->endpoints[START], &path->endpoints[START]);
find_single_matching_endpoint(cusp, &path->prev->endpoints[FINISH], &path->endpoints[FINISH]);

return path;
}
Expand Down Expand Up @@ -2085,7 +2078,7 @@ void find_single_endpoint(CuspStructure *cusp, PathEndPoint *path_endpoint, int
path_endpoint->tri = region->tri;
path_endpoint->vertex = vertex;
path_endpoint->face = face;
path_endpoint->region_index = i;
path_endpoint->region_index = region->index;
path_endpoint->num_adj_curves = region->num_adj_curves[path_endpoint->face][path_endpoint->vertex];

return ;
Expand All @@ -2105,8 +2098,7 @@ void find_single_endpoint(CuspStructure *cusp, PathEndPoint *path_endpoint, int
* conditions for a matching endpoint.
*/

void find_single_matching_endpoint(CuspStructure *cusp, PathEndPoint *path_endpoint1, PathEndPoint *path_endpoint2,
int edge_class, int edge_index) {
void find_single_matching_endpoint(CuspStructure *cusp, PathEndPoint *path_endpoint1, PathEndPoint *path_endpoint2) {
int i;
Boolean region_index, region_vertex, region_dive, region_curve;
CuspRegion *region;
Expand Down Expand Up @@ -2606,14 +2598,29 @@ void update_cusp_triangle_endpoints(CuspRegion *cusp_region_start, CuspRegion *c
void update_adj_curve_along_path(CuspStructure **cusps, OscillatingCurves *curves, int curve_index, Boolean train_line) {
int cusp_index, edge_class, edge_index;
CurveComponent *curve,
*dual_curve_begin = &curves->curve_begin[curve_index],
*dual_curve_end = &curves->curve_end[curve_index];
*current_begin = &curves->curve_begin[curve_index],
*current_end = &curves->curve_end[curve_index];
CuspStructure *cusp;
Triangulation *manifold = cusps[0]->manifold;

// Update regions curve data
for (curve = dual_curve_begin->next; curve != dual_curve_end; curve = curve->next)
// Update regions curve data along the current curve
for (curve = current_begin->next; curve != current_end; curve = curve->next)
update_adj_curve_on_cusp(cusps[curve->cusp_index]);

// update endpoint curve data
for (int i = 0; i < curve_index; i++) {
// which oscillating curve

for (curve = curves->curve_begin[i].next; curve != &curves->curve_end[i]; curve = curve->next) {
// which component of the curve

for (int j = 0; j < 2; j++) {
// which end point
update_adj_curve_at_endpoint(&curve->endpoints[j], current_begin->next, START);
update_adj_curve_at_endpoint(&curve->endpoints[j], current_end->prev, FINISH);
}
}
}
}

/*
Expand Down

0 comments on commit f4c6644

Please sign in to comment.