Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename Surface to Triangle. #172

Merged
merged 22 commits into from
Jan 13, 2020
Merged

Rename Surface to Triangle. #172

merged 22 commits into from
Jan 13, 2020

Conversation

dhermes
Copy link
Owner

@dhermes dhermes commented Jan 12, 2020

Fixes #132.

@dhermes
Renaming all surface filenames with triangle.
49b3569 
To confirm they have all been covered (independent of casing):

```
git ls-files | grep -i surface
```

This commit was fully generated via

```
set -e -x

git mv docs/abi/surface.rst                               docs/abi/triangle.rst
git mv docs/abi/surface_intersection.rst                  docs/abi/triangle_intersection.rst
git mv docs/images/newton_refine_surface.png              docs/images/newton_refine_triangle.png
git mv docs/images/surface_constructor.png                docs/images/triangle_constructor.png
git mv docs/images/surface_elevate.png                    docs/images/triangle_elevate.png
git mv docs/images/surface_evaluate_barycentric.png       docs/images/triangle_evaluate_barycentric.png
git mv docs/images/surface_evaluate_barycentric_multi.png docs/images/triangle_evaluate_barycentric_multi.png
git mv docs/images/surface_evaluate_cartesian_multi.png   docs/images/triangle_evaluate_cartesian_multi.png
git mv docs/images/surface_is_valid1.png                  docs/images/triangle_is_valid1.png
git mv docs/images/surface_is_valid2.png                  docs/images/triangle_is_valid2.png
git mv docs/images/surface_is_valid3.png                  docs/images/triangle_is_valid3.png
git mv docs/images/surface_locate.png                     docs/images/triangle_locate.png
git mv docs/images/surface_subdivide1.png                 docs/images/triangle_subdivide1.png
git mv docs/images/surface_subdivide2.png                 docs/images/triangle_subdivide2.png
git mv docs/images/surfaces10Q_and_17Q.png                docs/images/triangles10Q_and_17Q.png
git mv docs/images/surfaces10Q_and_18Q.png                docs/images/triangles10Q_and_18Q.png
git mv docs/images/surfaces10Q_and_19Q.png                docs/images/triangles10Q_and_19Q.png
git mv docs/images/surfaces10Q_and_40Q.png                docs/images/triangles10Q_and_40Q.png
git mv docs/images/surfaces10Q_and_44Q.png                docs/images/triangles10Q_and_44Q.png
git mv docs/images/surfaces11L_and_33Q.png                docs/images/triangles11L_and_33Q.png
git mv docs/images/surfaces11Q_and_12Q.png                docs/images/triangles11Q_and_12Q.png
git mv docs/images/surfaces13L_and_38Q.png                docs/images/triangles13L_and_38Q.png
git mv docs/images/surfaces13Q_and_35Q.png                docs/images/triangles13Q_and_35Q.png
git mv docs/images/surfaces15Q_and_16Q.png                docs/images/triangles15Q_and_16Q.png
git mv docs/images/surfaces17Q_and_10Q.png                docs/images/triangles17Q_and_10Q.png
git mv docs/images/surfaces1C_and_12L.png                 docs/images/triangles1C_and_12L.png
git mv docs/images/surfaces1L_and_10L.png                 docs/images/triangles1L_and_10L.png
git mv docs/images/surfaces1L_and_28Q.png                 docs/images/triangles1L_and_28Q.png
git mv docs/images/surfaces1L_and_29Q.png                 docs/images/triangles1L_and_29Q.png
git mv docs/images/surfaces1L_and_2L.png                  docs/images/triangles1L_and_2L.png
git mv docs/images/surfaces1L_and_39Q.png                 docs/images/triangles1L_and_39Q.png
git mv docs/images/surfaces1L_and_3L.png                  docs/images/triangles1L_and_3L.png
git mv docs/images/surfaces1L_and_6L.png                  docs/images/triangles1L_and_6L.png
git mv docs/images/surfaces1L_and_7L.png                  docs/images/triangles1L_and_7L.png
git mv docs/images/surfaces1L_and_9L.png                  docs/images/triangles1L_and_9L.png
git mv docs/images/surfaces1Q_and_2C.png                  docs/images/triangles1Q_and_2C.png
git mv docs/images/surfaces1Q_and_2Q.png                  docs/images/triangles1Q_and_2Q.png
git mv docs/images/surfaces1Q_and_3Q.png                  docs/images/triangles1Q_and_3Q.png
git mv docs/images/surfaces1Q_and_45Q.png                 docs/images/triangles1Q_and_45Q.png
git mv docs/images/surfaces1Q_and_5L.png                  docs/images/triangles1Q_and_5L.png
git mv docs/images/surfaces20Q_and_21Q.png                docs/images/triangles20Q_and_21Q.png
git mv docs/images/surfaces24Q_and_25Q.png                docs/images/triangles24Q_and_25Q.png
git mv docs/images/surfaces26Q_and_27Q.png                docs/images/triangles26Q_and_27Q.png
git mv docs/images/surfaces29Q_and_42Q.png                docs/images/triangles29Q_and_42Q.png
git mv docs/images/surfaces29Q_and_43Q.png                docs/images/triangles29Q_and_43Q.png
git mv docs/images/surfaces30Q_and_31Q.png                docs/images/triangles30Q_and_31Q.png
git mv docs/images/surfaces32Q_and_33Q.png                docs/images/triangles32Q_and_33Q.png
git mv docs/images/surfaces36Q_and_37Q.png                docs/images/triangles36Q_and_37Q.png
git mv docs/images/surfaces3C_and_4C.png                  docs/images/triangles3C_and_4C.png
git mv docs/images/surfaces3Q_and_13Q.png                 docs/images/triangles3Q_and_13Q.png
git mv docs/images/surfaces3Q_and_14Q.png                 docs/images/triangles3Q_and_14Q.png
git mv docs/images/surfaces3Q_and_4Q.png                  docs/images/triangles3Q_and_4Q.png
git mv docs/images/surfaces3Q_and_5Q.png                  docs/images/triangles3Q_and_5Q.png
git mv docs/images/surfaces41Q_and_21Q.png                docs/images/triangles41Q_and_21Q.png
git mv docs/images/surfaces46Q_and_47Q.png                docs/images/triangles46Q_and_47Q.png
git mv docs/images/surfaces48Q_and_14L.png                docs/images/triangles48Q_and_14L.png
git mv docs/images/surfaces49Q_and_15L.png                docs/images/triangles49Q_and_15L.png
git mv docs/images/surfaces4L_and_22Q.png                 docs/images/triangles4L_and_22Q.png
git mv docs/images/surfaces4L_and_23Q.png                 docs/images/triangles4L_and_23Q.png
git mv docs/images/surfaces4Q_and_10Q.png                 docs/images/triangles4Q_and_10Q.png
git mv docs/images/surfaces50Q_and_51Q.png                docs/images/triangles50Q_and_51Q.png
git mv docs/images/surfaces52Q_and_53Q.png                docs/images/triangles52Q_and_53Q.png
git mv docs/images/surfaces54Q_and_55Q.png                docs/images/triangles54Q_and_55Q.png
git mv docs/images/surfaces56Q_and_57Q.png                docs/images/triangles56Q_and_57Q.png
git mv docs/images/surfaces56Q_and_71Q.png                docs/images/triangles56Q_and_71Q.png
git mv docs/images/surfaces58Q_and_59Q.png                docs/images/triangles58Q_and_59Q.png
git mv docs/images/surfaces58Q_and_83Q.png                docs/images/triangles58Q_and_83Q.png
git mv docs/images/surfaces60Q_and_61Q.png                docs/images/triangles60Q_and_61Q.png
git mv docs/images/surfaces62Q_and_63Q.png                docs/images/triangles62Q_and_63Q.png
git mv docs/images/surfaces64Q_and_65Q.png                docs/images/triangles64Q_and_65Q.png
git mv docs/images/surfaces66Q_and_67Q.png                docs/images/triangles66Q_and_67Q.png
git mv docs/images/surfaces68Q_and_55Q.png                docs/images/triangles68Q_and_55Q.png
git mv docs/images/surfaces69Q_and_70Q.png                docs/images/triangles69Q_and_70Q.png
git mv docs/images/surfaces6Q_and_34Q.png                 docs/images/triangles6Q_and_34Q.png
git mv docs/images/surfaces6Q_and_7Q.png                  docs/images/triangles6Q_and_7Q.png
git mv docs/images/surfaces72Q_and_73Q.png                docs/images/triangles72Q_and_73Q.png
git mv docs/images/surfaces74Q_and_75Q.png                docs/images/triangles74Q_and_75Q.png
git mv docs/images/surfaces76Q_and_77Q.png                docs/images/triangles76Q_and_77Q.png
git mv docs/images/surfaces76Q_and_78Q.png                docs/images/triangles76Q_and_78Q.png
git mv docs/images/surfaces79Q_and_80Q.png                docs/images/triangles79Q_and_80Q.png
git mv docs/images/surfaces81Q_and_82Q.png                docs/images/triangles81Q_and_82Q.png
git mv docs/images/surfaces84Q_and_85Q.png                docs/images/triangles84Q_and_85Q.png
git mv docs/images/surfaces86Q_and_87Q.png                docs/images/triangles86Q_and_87Q.png
git mv docs/images/surfaces8L_and_29Q.png                 docs/images/triangles8L_and_29Q.png
git mv docs/images/surfaces8Q_and_9Q.png                  docs/images/triangles8Q_and_9Q.png
git mv docs/images/surfaces9L_and_1L.png                  docs/images/triangles9L_and_1L.png
git mv docs/images/test_surface1_and_point0.png           docs/images/test_triangle1_and_point0.png
git mv docs/images/test_surface1_and_point1.png           docs/images/test_triangle1_and_point1.png
git mv docs/images/test_surface2_and_point1.png           docs/images/test_triangle2_and_point1.png
git mv docs/images/test_surface2_and_point2.png           docs/images/test_triangle2_and_point2.png
git mv docs/images/test_surface2_and_point4.png           docs/images/test_triangle2_and_point4.png
git mv docs/images/test_surface3_and_point1.png           docs/images/test_triangle3_and_point1.png
git mv docs/images/test_surface3_and_point3.png           docs/images/test_triangle3_and_point3.png
git mv docs/images/test_surface4_and_point2.png           docs/images/test_triangle4_and_point2.png
git mv docs/images/test_surface4_and_point4.png           docs/images/test_triangle4_and_point4.png
git mv docs/python/pxd/surface.rst                        docs/python/pxd/triangle.rst
git mv docs/python/pxd/surface_intersection.rst           docs/python/pxd/triangle_intersection.rst
git mv docs/python/reference/bezier.surface.rst           docs/python/reference/bezier.triangle.rst
git mv src/fortran/include/bezier/surface.h               src/fortran/include/bezier/triangle.h
git mv src/fortran/include/bezier/surface_intersection.h  src/fortran/include/bezier/triangle_intersection.h
git mv src/fortran/surface.f90                            src/fortran/triangle.f90
git mv src/fortran/surface_intersection.f90               src/fortran/triangle_intersection.f90
git mv src/python/bezier/_py_surface_helpers.py           src/python/bezier/_py_triangle_helpers.py
git mv src/python/bezier/_py_surface_intersection.py      src/python/bezier/_py_triangle_intersection.py
git mv src/python/bezier/_surface.pxd                     src/python/bezier/_triangle.pxd
git mv src/python/bezier/_surface_helpers.py              src/python/bezier/_triangle_helpers.py
git mv src/python/bezier/_surface_intersection.pxd        src/python/bezier/_triangle_intersection.pxd
git mv src/python/bezier/_surface_intersection.py         src/python/bezier/_triangle_intersection.py
git mv src/python/bezier/surface.py                       src/python/bezier/triangle.py
git mv tests/fortran/test_surface.f90                     tests/fortran/test_triangle.f90
git mv tests/fortran/test_surface_intersection.f90        tests/fortran/test_triangle_intersection.f90
git mv tests/functional/make_surface_locate_images.py     tests/functional/make_triangle_locate_images.py
git mv tests/functional/make_surface_surface_images.py    tests/functional/make_triangle_triangle_images.py
git mv tests/functional/schema/surface.json               tests/functional/schema/triangle.json
git mv tests/functional/schema/surface_intersection.json  tests/functional/schema/triangle_intersection.json
git mv tests/functional/surface_intersections.json        tests/functional/triangle_intersections.json
git mv tests/functional/surfaces.json                     tests/functional/triangles.json
git mv tests/functional/test_surface_locate.py            tests/functional/test_triangle_locate.py
git mv tests/functional/test_surface_surface.py           tests/functional/test_triangle_triangle.py
git mv tests/unit/test__py_surface_helpers.py             tests/unit/test__py_triangle_helpers.py
git mv tests/unit/test__py_surface_intersection.py        tests/unit/test__py_triangle_intersection.py
git mv tests/unit/test__surface_helpers.py                tests/unit/test__triangle_helpers.py
git mv tests/unit/test__surface_intersection.py           tests/unit/test__triangle_intersection.py
git mv tests/unit/test_surface.py                         tests/unit/test_triangle.py
```
@dhermes
Replaced **all** instances of Surface with Triangle.
e668f88 
(This was case-sensitive.) Done via:

```
git grep -l Surface | xargs sed -i    s/Surface/Triangle/g
git grep -l Surface | xargs sed -i '' s/Surface/Triangle/g
```

This ended up doing it in more files than it should have, e.g. in
historical releases, so will need a follow-up to undo some of the
changes.
@dhermes
Undoing (hopefully all) changes from previous commit that were premat…
657c72f 
…ure.
@dhermes
Replaced **all** instances of SURFACE with TRIANGLE.
5e94d31 
(This was case-sensitive.) Done via:

```
git grep -l SURFACE | xargs sed -i    s/SURFACE/TRIANGLE/g
git grep -l SURFACE | xargs sed -i '' s/SURFACE/TRIANGLE/g
```
@dhermes
Replaced **all** instances of surface with triangle.
1892961 
(This was case-sensitive.) Done via:

```
git grep -l surface | xargs sed -i    s/surface/triangle/g
git grep -l surface | xargs sed -i '' s/surface/triangle/g
```

This ended up doing it in more files than it should have, e.g. in
historical releases, so will need a follow-up to undo some of the
changes.
@dhermes
Updating make help output in pure-Fortran README.
d0d9ffb
@dhermes
Undoing (hopefully all) changes from previous commit that were premat…
d96b692 
…ure.

I.e. this was the commit that did a case-sensitive replace:
`surface` -> `triangle`.
@dhermes
Regenerating _speedup.c.
140b063 
It looks like the primary difference is movement based on
alphabetical ordering (but I did not check closely).
@dhermes
Ran nox -s blacken -r.
aa876e4
@dhermes
Fixing lint violations.
192c8bb
@dhermes
Adding a legacy bezier.Surface alias.
219ab21
@dhermes
Fix docs headers (since triangle has one more letter than surface).
3e2a39f
@dhermes dhermes self-assigned this Jan 12, 2020
@dhermes
Moving latest release in 0.11.0.rst (for now).
1554a67 
Will edit in the next commit.
@dhermes
Updating latest release to reflect this PR.
6af8989
@dhermes
Updating all .dev1 versions to match.
4ceb38e
@dhermes
Fixing version -> versions grammatical error.
2d28684
@dhermes
Fixing some fixed length character lenghts in Fortran unit tests.
18ec9bc 
Had to add 1 to all of them because triangle has one more letter than surface.
@dhermes
Making sure bezier.Surface alias shows up in docs.
43e08ad 
In the process, also removing the Apache LICENSE header in the
`.pxd` file visualizations.
@dhermes
Wrapping Triangle constructor with a deprecation warning.
1cde156
@dhermes
Fixing indents in docs/abi/.
bab2152 
These were caused by the fact that these were aligned and triangle
has one more letter than surface.
@dhermes
Final review.
bca1eca 
Covered

- A few unrelated issues (e.g. `y(s)` became `z(s)`)
- Adding an extra `#` character due to triangle extra character over
  surface
- Renaming some `surf_{...}` variables as `triangle_{...}`
- Reverting "triangle patch" to "surface patch"
- Fixing an incorrect "of the triangle" to be "of the curve"
- Adding some missing punctuation
@dhermes
Fixing lint issue in test__legacy.py.
505124d
@dhermes dhermes merged commit 42fa6d2 into master Jan 13, 2020
@dhermes dhermes deleted the issue-132 branch January 13, 2020 05:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@dhermes dhermes

Labels
docs hygiene
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Rename Surface to Triangle
1 participant
@dhermes