← Back to branch summary

~ubuntu-branches/ubuntu/vivid/regina-normal/vivid

« back to all changes in this revision

Viewing changes to engine/surfaces/nsorientedquad.cpp

  • Committer: Package Import Robot
  • Author(s): Ben Burton
  • Date: 2013-11-02 11:44:32 UTC
  • mfrom: (1.2.8)
  • Revision ID: package-import@ubuntu.com-20131102114432-acgci6b1pb2hjl8q
Tags: 4.95-1
* New upstream release.
* The python module is now installed in a standard location beneath
  /usr/lib/python2.7/dist-packages.
* Switched python packaging from python-support to dh_python2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
engine/surfaces/nsorientedquad.cpp
182
182
        std::deque<NEdgeEmbedding>::const_iterator eembit, backupit,
183
183
            endit, beginit;
184
184
        NTetrahedron* tet;
185
 
        NTetrahedron* adj;
186
185
        NPerm4 tetPerm, adjPerm;
187
186
        unsigned long tetIndex, adjIndex;
188
187
        NLargeInteger expect;
236
235
                // vertex.  Run backwards from here and fill in all the
237
236
                // holes.
238
237
                backupit = eembit;
239
 
                adj = (*eembit).getTetrahedron();
240
238
                adjPerm = (*eembit).getVertices();
241
 
                adjIndex = triang->tetrahedronIndex(adj);
 
239
                adjIndex = triang->tetrahedronIndex((*eembit).getTetrahedron());
242
240
                while (eembit != beginit) {
243
241
                    eembit--;
244
242
 
272
270
                    if (usedEdges[end].insert(edge).second)
273
271
                        examine.push_back(EdgeEnd(edge, end));
274
272
 
275
 
                    adj = tet;
276
273
                    adjPerm = tetPerm;
277
274
                    adjIndex = tetIndex;
278
275
                }
282
279
                // always checking to ensure the
283
280
                // matching equations have not been broken.
284
281
                eembit = backupit;
285
 
                adj = (*eembit).getTetrahedron();
286
282
                adjPerm = (*eembit).getVertices();
287
 
                adjIndex = triang->tetrahedronIndex(adj);
 
283
                adjIndex = triang->tetrahedronIndex((*eembit).getTetrahedron());
288
284
                for (eembit++; eembit != endit; eembit++) {
289
285
                    // Work out the coordinate for the disc type at eembit.
290
286
                    tet = (*eembit).getTetrahedron();
325
321
                        }
326
322
                    }
327
323
 
328
 
                    adj = tet;
329
324
                    adjPerm = tetPerm;
330
325
                    adjIndex = tetIndex;
331
326
                }