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.

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

Wrong spelling for "euclidean" #1153

Closed
2 tasks
dkastl opened this issue Nov 6, 2018 · 13 comments
Closed
2 tasks

Wrong spelling for "euclidean" #1153

dkastl opened this issue Nov 6, 2018 · 13 comments

Comments

@dkastl
Copy link
Member

dkastl commented Nov 6, 2018

There is at least one place, where "euclidean" is spelled wrong:
https://docs.pgrouting.org/2.6/en/pgr_eucledianTSP.html#pgr-euclediantsp

Since this is also in the URL of the function, the URL will change, when the name changes, so we could add a warning message in v2.7, that the function will change its name in v3.0:

  • Add deprecation notice in v2.7(or v2.6 bug-fix release)
  • Rename the function (and other occurrences) in v3.0
@cvvergara
Copy link
Member

I would like:
v2.6.2 for a bug fixes like the one in #1152 which is an internal C/C++ code change
and
v2.7.0 for when we know exactly what is coming on 3.0:

  • No internal C/C++ code change
  • deprecate functions that will be gone on 3.0
  • add warning messages to functions that are deprecated and will be gone on 3.0
  • Backport from 3.0-dev the documentation that we are standardizing
  • Backport the SQL comments soon to be standardized

@cvvergara
Copy link
Member

My dyslexia showed up, I apologize

@SunveerSingh
Copy link
Contributor

Hey, I would like to help in this issue, please let me know if I can help.

@dkastl
Copy link
Member Author

dkastl commented Nov 10, 2018

@SunveerSingh , thank you for your offer to help! This task goes beyond just fixing text in the documentation, so it requires quite some coordination with release, because the function name will change, too.

@cvvergara will let you know, when she will make the internal changes. It would be definitly good to have some people testing it and give feedback.

@SunveerSingh
Copy link
Contributor

@dkastl Thank you, lets see what @cvvergara say.

@cvvergara
Copy link
Member

cvvergara commented Nov 11, 2018

@SunveerSingh
This fix needs a new release, like I mentioned above
But you can inspect all the steps that are needed to make a release, for example

#1095

@cvvergara
Copy link
Member

cvvergara commented Dec 29, 2018

Working on pgr_eucledianTSP name change

Traveling Sales Person - Family of functions
pgr_TSP - When input is given as matrix cell information.
pgr_eucledianTSP - When input are coordinates.

Current use example

-- will use euclidean distances of the information

SELECT * FROM pgr_eucledianTSP(
        $$
        SELECT id,  x,  y  FROM edge_table_vertices_pgr
        $$
    )

&
-- will use the distances given (start_vid, end_vid, agg_cost) etiher the information is stored on a table or its obtained by using a CostMatrix function like this

SELECT * FROM pgr_TSP(
        $$
        SELECT start_vid, end_vid, agg_cost FROM mycostmatrix
        $$
    )
SELECT * FROM pgr_TSP(
    $$
    SELECT * FROM pgr_dijkstraCostMatrix(
        'SELECT id, source, target, cost, reverse_cost FROM edge_table',
        (SELECT array_agg(id) FROM edge_table_vertices_pgr),
        false
    )
    $$
);

Both functions are using simulated annealing to be solved,
But there are many other approximation methods to solve TSP, that in the future they could be implemented

option A

  • pgr_eucledianTSP -> pgr_TSPannealingEuclidean
  • pgr_TSP -> pgr_TSPannealing

Where

  • pgr_TSP : have the name of the problem first
  • annealing : have the name of the algorithm used
  • Euclidean : when data is (id,x,y) then it will use euclidean distances

option B

change

  • pgr_eucledianTSP -> pgr_TSPeuclidean
  • pgr_TSP -> pgr_TSP

Where

  • pgr_TSP : have the name of the problem first
  • Euclidean : when data is (id,x,y) then it will use euclidean distances

Leave for the future the implementation of other algorithms that approximate a solution to TSP

option C

  • pgr_eucledianTSP -> pgr_TSP
  • pgr_TSP -> pgr_TSP

Where

  • pgr_TSP : have the name of the problem first

Leave for the future the implementation of other algorithms that approximate a solution to TSP
Internally figure out if the query gives (id,x,y) or if it gives (start_vid, end_vid, agg_cost) as data
Then the name euclidean can be avoided.

option D

  • pgr_eucledianTSP -> pgr_TSPannealing
  • pgr_TSP -> pgr_TSPannealing

Where

  • pgr_TSP : have the name of the problem first
  • annealing : have the name of the algorithm used

Internally figure out if the query gives (id,x,y) or if it gives (start_vid, end_vid, agg_cost) as data
Then the name euclidean can be avoided.

my preference

My preference is tackle the different algorithms now so A or D

  • A is fast to solve basically is name changes
  • D is more complicated, but not impossible

The work could be done like this:

  • Do option B, make the PR to develop
  • Do option A, make the PR to develop
  • Try to do option D in at most 2 weeks time do PR to develop (doable? doable fast?, if its too difficult then dont do the PR)
    Then choose.

cvvergara added a commit to cvvergara/pgrouting that referenced this issue Dec 30, 2018
Changes committed

Updating NEWS and release notes
	modified:   NEWS
	modified:   doc/src/release_notes.rst

Deleting unused file
	deleted:    doc/src/release_notes.back.rst

Fixing filenames
	renamed:    doc/queries/doc-pgr_eucledianTSP.queries -> doc/queries/doc-pgr_TSPeuclidean.queries
	renamed:    doc/tsp/pgr_eucledianTSP.rst -> doc/tsp/pgr_TSPeuclidean.rst
	renamed:    include/drivers/tsp/eucledianTSP_driver.h -> include/drivers/tsp/euclideanTSP_driver.h
	renamed:    include/tsp/eucledianDmatrix.h -> include/tsp/euclideanDmatrix.h
	renamed:    locale/de/LC_MESSAGES/pgr_eucledianTSP.po -> locale/de/LC_MESSAGES/pgr_TSPeuclidean.po
	renamed:    sql/tsp/eucledianTSP.sql -> sql/tsp/TSPeuclidean.sql
	renamed:    src/tsp/Dmatrix.cpp -> src/cpp_common/Dmatrix.cpp
	renamed:    src/tsp/newTSP.c -> src/tsp/TSP.c
	renamed:    src/tsp/newTSP_driver.cpp -> src/tsp/TSP_driver.cpp
	renamed:    src/tsp/eucledianDmatrix.cpp -> src/tsp/euclideanDmatrix.cpp
	renamed:    src/tsp/eucledianTSP.c -> src/tsp/euclideanTSP.c
	renamed:    src/tsp/eucledianTSP_driver.cpp -> src/tsp/euclideanTSP_driver.cpp

Using new filenames on Build
	modified:   src/cpp_common/CMakeLists.txt
	modified:   src/tsp/CMakeLists.txt
	modified:   doc/queries/CMakeLists.txt
	modified:   doc/tsp/CMakeLists.txt
	modified:   sql/tsp/CMakeLists.txt

Fixing documentation
	modified:   doc/queries/doc-pgr_TSP.queries
	modified:   doc/src/pgRouting-concepts.rst
	modified:   doc/tsp/TSP-family.rst
	modified:   doc/tsp/pgr_TSP.rst

Fixing spelling & using new names
	modified:   include/c_types/pickDeliver/pickDeliveryOrders_t.h
	modified:   include/c_types/pickDeliver/vehicle_t.h
	modified:   include/tsp/pgr_tsp.hpp

Reorganizing TSP directory
	modified:   sql/tsp/TSP.sql
	new file:   sql/tsp/_TSP.sql
	new file:   sql/tsp/_TSPeuclidean.sql

Current signatures
	modified:   sql/sigs/pgrouting--3.0.0.sig

pgTap tests
* New tests
	new file:   pgtap/tsp/TSPeuclidean/illegal_values.sql
	new file:   pgtap/tsp/TSPeuclidean/innerQuery.sql
	new file:   pgtap/tsp/TSPeuclidean/types_check.sql
* renaming old test
	renamed:    pgtap/tsp/no_crash_test-eucledianTSP.sql -> pgtap/tsp/TSPeuclidean/no_crash_test.sql
* Deleting no longer used test
	deleted:    pgtap/tsp/pgr_eucledianTSP_types_check.sql

Documentation queries
* Fixing filenames
	renamed:    test/tsp/doc-pgr_TSP-windows.test.sql -> test/tsp/doc-pgr_TSP.test.sql
	renamed:    test/tsp/doc-pgr_eucledianTSP.result -> test/tsp/doc-pgr_TSPeuclidean.result
	renamed:    test/tsp/doc-pgr_TSP-windows.result -> test/tsp/win-pgr_TSP.result
	renamed:    test/tsp/doc-pgr_TSP-mac.test.sql -> test/tsp/win-pgr_TSP.test.sql
* Using correct spelling inside files
	modified:   test/tsp/development/gr9882-tsp.test.sql
	modified:   test/tsp/development/qa194-tsp.test.sql
	modified:   test/tsp/development/wi29-tsp.result
	modified:   test/tsp/development/wi29-tsp.test.sql
	modified:   test/tsp/doc-pgr_TSP.result
	modified:   test/tsp/performance/dj38.sql
	modified:   test/tsp/performance/qa194.sql
	modified:   test/tsp/performance/wi29.sql
* New tests
	new file:   test/tsp/doc-pgr_TSPeuclidean.test.sql
* Using new file names
	modified:   test/tsp/test.conf
* Deleting unused tests
	deleted:    test/tsp/doc-pgr_TSP-mac.result
	deleted:    test/tsp/doc-pgr_eucledianTSP.test.sql
	deleted:    test/tsp/doc-tsp-mac.result
	deleted:    test/tsp/doc-tsp-mac.test.sql
	deleted:    test/tsp/doc-tsp-windows.result
	deleted:    test/tsp/doc-tsp-windows.test.sql

Reflect changes on transifex configuration
	modified:   .tx/config

Moving to legacy deprecated TSP signatures
	new file:   sql/legacy/tsp/TSPeucledian.sql
	renamed:    sql/tsp/_makeDistanceMatrix.sql -> sql/legacy/tsp/_makeDistanceMatrix.sql
	renamed:    sql/tsp/tsp_v2.0_coordinates.sql -> sql/legacy/tsp/tsp_v2.0_coordinates.sql
	renamed:    sql/tsp/tsp_v2.0_matrix.sql -> sql/legacy/tsp/tsp_v2.0_matrix.sql

Removing trailing spaces
	modified:   src/common/orders_input.c
	modified:   src/common/vehicles_input.c
cvvergara added a commit to cvvergara/pgrouting that referenced this issue Dec 30, 2018
Changes committed:

Updating NEWS and release notes
	modified:   NEWS
	modified:   doc/src/release_notes.rst

Updating documentation
	modified:   doc/costMatrix/costMatrix-category.rst
	modified:   doc/costMatrix/pgr_bdDijkstraCostMatrix.rst
	modified:   doc/costMatrix/pgr_dijkstraCostMatrix.rst
	modified:   doc/costMatrix/pgr_withPointsCostMatrix.rst
	modified:   doc/src/routingFunctions.rst
	modified:   doc/tsp/TSP-family.rst
	modified:   pgtap/tsp/TSPeuclidean/illegal_values.sql
	modified:   pgtap/tsp/TSPeuclidean/innerQuery.sql
	modified:   pgtap/tsp/TSPeuclidean/no_crash_test.sql
	modified:   pgtap/tsp/TSPeuclidean/types_check.sql
	modified:   pgtap/tsp/no_crash_test-tsp.sql
	modified:   pgtap/tsp/pgr_TSP_types_check.sql
	modified:   sql/sigs/pgrouting--3.0.0.sig

Renaming documentation files to match function renaming
	renamed:    doc/tsp/pgr_TSPeuclidean.rst -> doc/tsp/pgr_TSPannealingEuclidean.rst
	renamed:    doc/tsp/pgr_TSP.rst -> doc/tsp/pgr_TSPannealing.rst
	renamed:    doc/queries/doc-pgr_TSP.queries -> doc/queries/doc-pgr_TSPannealing.queries
	renamed:    doc/queries/doc-pgr_TSPeuclidean.queries -> doc/queries/doc-pgr_TSPannealingEuclidean.queries

Renaming sql files to match function renaming
	renamed:    sql/tsp/TSP.sql -> sql/tsp/TSPannealing.sql
	renamed:    sql/tsp/TSPeuclidean.sql -> sql/tsp/TSPannealingEuclidean.sql
	renamed:    sql/tsp/_TSP.sql -> sql/tsp/_TSPannealing.sql
	renamed:    sql/tsp/_TSPeuclidean.sql -> sql/tsp/_TSPannealingEuclidean.sql

Renaming test files to match function renaming
	renamed:    test/tsp/doc-pgr_TSP.result -> test/tsp/doc-pgr_TSPannealing.result
	renamed:    test/tsp/doc-pgr_TSP.test.sql -> test/tsp/doc-pgr_TSPannealing.test.sql
	renamed:    test/tsp/doc-pgr_TSPeuclidean.result -> test/tsp/doc-pgr_TSPannealingEuclidean.result
	renamed:    test/tsp/doc-pgr_TSPeuclidean.test.sql -> test/tsp/doc-pgr_TSPannealingEuclidean.test.sql
	renamed:    test/tsp/win-pgr_TSP.result -> test/tsp/win-pgr_TSPannealing.result
	renamed:    test/tsp/win-pgr_TSP.test.sql -> test/tsp/win-pgr_TSPannealing.test.sql

Using new names on build
	modified:   sql/tsp/CMakeLists.txt
	modified:   doc/queries/CMakeLists.txt
	modified:   doc/tsp/CMakeLists.txt

Using new names on documentation queries
	modified:   test/tsp/test.conf

Using new names on transifex configuration
	modified:   .tx/config
@dkastl
Copy link
Member Author

dkastl commented Dec 31, 2018

Option B sounds also good for me as a start.

cvvergara added a commit to cvvergara/pgrouting that referenced this issue Dec 31, 2018
	modified:   doc/astar/pgr_aStarCostMatrix.rst
	modified:   doc/bdAstar/pgr_bdAstarCostMatrix.rst
	modified:   doc/queries/doc-pgr_fooDmatrix.queries
	modified:   test/costMatrix/doc-pgr_fooDmatrix.result
	modified:   test/costMatrix/doc-pgr_fooDmatrix.test.sql
cvvergara added a commit to cvvergara/pgrouting that referenced this issue Dec 31, 2018
Changes committed

Updating NEWS and release notes
	modified:   NEWS
	modified:   doc/src/release_notes.rst

Deleting unused file
	deleted:    doc/src/release_notes.back.rst

Fixing filenames
	renamed:    doc/queries/doc-pgr_eucledianTSP.queries -> doc/queries/doc-pgr_TSPeuclidean.queries
	renamed:    doc/tsp/pgr_eucledianTSP.rst -> doc/tsp/pgr_TSPeuclidean.rst
	renamed:    include/drivers/tsp/eucledianTSP_driver.h -> include/drivers/tsp/euclideanTSP_driver.h
	renamed:    include/tsp/eucledianDmatrix.h -> include/tsp/euclideanDmatrix.h
	renamed:    locale/de/LC_MESSAGES/pgr_eucledianTSP.po -> locale/de/LC_MESSAGES/pgr_TSPeuclidean.po
	renamed:    sql/tsp/eucledianTSP.sql -> sql/tsp/TSPeuclidean.sql
	renamed:    src/tsp/Dmatrix.cpp -> src/cpp_common/Dmatrix.cpp
	renamed:    src/tsp/newTSP.c -> src/tsp/TSP.c
	renamed:    src/tsp/newTSP_driver.cpp -> src/tsp/TSP_driver.cpp
	renamed:    src/tsp/eucledianDmatrix.cpp -> src/tsp/euclideanDmatrix.cpp
	renamed:    src/tsp/eucledianTSP.c -> src/tsp/euclideanTSP.c
	renamed:    src/tsp/eucledianTSP_driver.cpp -> src/tsp/euclideanTSP_driver.cpp

Using new filenames on Build
	modified:   src/cpp_common/CMakeLists.txt
	modified:   src/tsp/CMakeLists.txt
	modified:   doc/queries/CMakeLists.txt
	modified:   doc/tsp/CMakeLists.txt
	modified:   sql/tsp/CMakeLists.txt

Fixing documentation
	modified:   doc/queries/doc-pgr_TSP.queries
	modified:   doc/src/pgRouting-concepts.rst
	modified:   doc/tsp/TSP-family.rst
	modified:   doc/tsp/pgr_TSP.rst

Fixing spelling & using new names
	modified:   include/c_types/pickDeliver/pickDeliveryOrders_t.h
	modified:   include/c_types/pickDeliver/vehicle_t.h
	modified:   include/tsp/pgr_tsp.hpp

Reorganizing TSP directory
	modified:   sql/tsp/TSP.sql
	new file:   sql/tsp/_TSP.sql
	new file:   sql/tsp/_TSPeuclidean.sql

Current signatures
	modified:   sql/sigs/pgrouting--3.0.0.sig

pgTap tests
* New tests
	new file:   pgtap/tsp/TSPeuclidean/illegal_values.sql
	new file:   pgtap/tsp/TSPeuclidean/innerQuery.sql
	new file:   pgtap/tsp/TSPeuclidean/types_check.sql
* renaming old test
	renamed:    pgtap/tsp/no_crash_test-eucledianTSP.sql -> pgtap/tsp/TSPeuclidean/no_crash_test.sql
* Deleting no longer used test
	deleted:    pgtap/tsp/pgr_eucledianTSP_types_check.sql

Documentation queries
* Fixing filenames
	renamed:    test/tsp/doc-pgr_TSP-windows.test.sql -> test/tsp/doc-pgr_TSP.test.sql
	renamed:    test/tsp/doc-pgr_eucledianTSP.result -> test/tsp/doc-pgr_TSPeuclidean.result
	renamed:    test/tsp/doc-pgr_TSP-windows.result -> test/tsp/win-pgr_TSP.result
	renamed:    test/tsp/doc-pgr_TSP-mac.test.sql -> test/tsp/win-pgr_TSP.test.sql
* Using correct spelling inside files
	modified:   test/tsp/development/gr9882-tsp.test.sql
	modified:   test/tsp/development/qa194-tsp.test.sql
	modified:   test/tsp/development/wi29-tsp.result
	modified:   test/tsp/development/wi29-tsp.test.sql
	modified:   test/tsp/doc-pgr_TSP.result
	modified:   test/tsp/performance/dj38.sql
	modified:   test/tsp/performance/qa194.sql
	modified:   test/tsp/performance/wi29.sql
* New tests
	new file:   test/tsp/doc-pgr_TSPeuclidean.test.sql
* Using new file names
	modified:   test/tsp/test.conf
* Deleting unused tests
	deleted:    test/tsp/doc-pgr_TSP-mac.result
	deleted:    test/tsp/doc-pgr_eucledianTSP.test.sql
	deleted:    test/tsp/doc-tsp-mac.result
	deleted:    test/tsp/doc-tsp-mac.test.sql
	deleted:    test/tsp/doc-tsp-windows.result
	deleted:    test/tsp/doc-tsp-windows.test.sql

Reflect changes on transifex configuration
	modified:   .tx/config

Moving to legacy deprecated TSP signatures
	new file:   sql/legacy/tsp/TSPeucledian.sql
	renamed:    sql/tsp/_makeDistanceMatrix.sql -> sql/legacy/tsp/_makeDistanceMatrix.sql
	renamed:    sql/tsp/tsp_v2.0_coordinates.sql -> sql/legacy/tsp/tsp_v2.0_coordinates.sql
	renamed:    sql/tsp/tsp_v2.0_matrix.sql -> sql/legacy/tsp/tsp_v2.0_matrix.sql

Removing trailing spaces
	modified:   src/common/orders_input.c
	modified:   src/common/vehicles_input.c
cvvergara added a commit to cvvergara/pgrouting that referenced this issue Dec 31, 2018
Changes committed:

Updating NEWS and release notes
	modified:   NEWS
	modified:   doc/src/release_notes.rst

Updating documentation
	modified:   doc/costMatrix/costMatrix-category.rst
	modified:   doc/costMatrix/pgr_bdDijkstraCostMatrix.rst
	modified:   doc/costMatrix/pgr_dijkstraCostMatrix.rst
	modified:   doc/costMatrix/pgr_withPointsCostMatrix.rst
	modified:   doc/src/routingFunctions.rst
	modified:   doc/tsp/TSP-family.rst
	modified:   pgtap/tsp/TSPeuclidean/illegal_values.sql
	modified:   pgtap/tsp/TSPeuclidean/innerQuery.sql
	modified:   pgtap/tsp/TSPeuclidean/no_crash_test.sql
	modified:   pgtap/tsp/TSPeuclidean/types_check.sql
	modified:   pgtap/tsp/no_crash_test-tsp.sql
	modified:   pgtap/tsp/pgr_TSP_types_check.sql
	modified:   sql/sigs/pgrouting--3.0.0.sig

Renaming documentation files to match function renaming
	renamed:    doc/tsp/pgr_TSPeuclidean.rst -> doc/tsp/pgr_TSPannealingEuclidean.rst
	renamed:    doc/tsp/pgr_TSP.rst -> doc/tsp/pgr_TSPannealing.rst
	renamed:    doc/queries/doc-pgr_TSP.queries -> doc/queries/doc-pgr_TSPannealing.queries
	renamed:    doc/queries/doc-pgr_TSPeuclidean.queries -> doc/queries/doc-pgr_TSPannealingEuclidean.queries

Renaming sql files to match function renaming
	renamed:    sql/tsp/TSP.sql -> sql/tsp/TSPannealing.sql
	renamed:    sql/tsp/TSPeuclidean.sql -> sql/tsp/TSPannealingEuclidean.sql
	renamed:    sql/tsp/_TSP.sql -> sql/tsp/_TSPannealing.sql
	renamed:    sql/tsp/_TSPeuclidean.sql -> sql/tsp/_TSPannealingEuclidean.sql

Renaming test files to match function renaming
	renamed:    test/tsp/doc-pgr_TSP.result -> test/tsp/doc-pgr_TSPannealing.result
	renamed:    test/tsp/doc-pgr_TSP.test.sql -> test/tsp/doc-pgr_TSPannealing.test.sql
	renamed:    test/tsp/doc-pgr_TSPeuclidean.result -> test/tsp/doc-pgr_TSPannealingEuclidean.result
	renamed:    test/tsp/doc-pgr_TSPeuclidean.test.sql -> test/tsp/doc-pgr_TSPannealingEuclidean.test.sql
	renamed:    test/tsp/win-pgr_TSP.result -> test/tsp/win-pgr_TSPannealing.result
	renamed:    test/tsp/win-pgr_TSP.test.sql -> test/tsp/win-pgr_TSPannealing.test.sql

Using new names on build
	modified:   sql/tsp/CMakeLists.txt
	modified:   doc/queries/CMakeLists.txt
	modified:   doc/tsp/CMakeLists.txt

Using new names on documentation queries
	modified:   test/tsp/test.conf

Using new names on transifex configuration
	modified:   .tx/config
cvvergara added a commit to cvvergara/pgrouting that referenced this issue Dec 31, 2018
	modified:   doc/astar/pgr_aStarCostMatrix.rst
	modified:   doc/bdAstar/pgr_bdAstarCostMatrix.rst
	modified:   doc/queries/doc-pgr_fooDmatrix.queries
	modified:   test/costMatrix/doc-pgr_fooDmatrix.result
	modified:   test/costMatrix/doc-pgr_fooDmatrix.test.sql
cvvergara added a commit to cvvergara/pgrouting that referenced this issue Dec 31, 2018
Changes committed

Updating NEWS and release notes
	modified:   NEWS
	modified:   doc/src/release_notes.rst

Deleting unused file
	deleted:    doc/src/release_notes.back.rst

Fixing filenames
	renamed:    doc/queries/doc-pgr_eucledianTSP.queries -> doc/queries/doc-pgr_TSPeuclidean.queries
	renamed:    doc/tsp/pgr_eucledianTSP.rst -> doc/tsp/pgr_TSPeuclidean.rst
	renamed:    include/drivers/tsp/eucledianTSP_driver.h -> include/drivers/tsp/euclideanTSP_driver.h
	renamed:    include/tsp/eucledianDmatrix.h -> include/tsp/euclideanDmatrix.h
	renamed:    locale/de/LC_MESSAGES/pgr_eucledianTSP.po -> locale/de/LC_MESSAGES/pgr_TSPeuclidean.po
	renamed:    sql/tsp/eucledianTSP.sql -> sql/tsp/TSPeuclidean.sql
	renamed:    src/tsp/Dmatrix.cpp -> src/cpp_common/Dmatrix.cpp
	renamed:    src/tsp/newTSP.c -> src/tsp/TSP.c
	renamed:    src/tsp/newTSP_driver.cpp -> src/tsp/TSP_driver.cpp
	renamed:    src/tsp/eucledianDmatrix.cpp -> src/tsp/euclideanDmatrix.cpp
	renamed:    src/tsp/eucledianTSP.c -> src/tsp/euclideanTSP.c
	renamed:    src/tsp/eucledianTSP_driver.cpp -> src/tsp/euclideanTSP_driver.cpp

Using new filenames on Build
	modified:   src/cpp_common/CMakeLists.txt
	modified:   src/tsp/CMakeLists.txt
	modified:   doc/queries/CMakeLists.txt
	modified:   doc/tsp/CMakeLists.txt
	modified:   sql/tsp/CMakeLists.txt

Fixing documentation
	modified:   doc/queries/doc-pgr_TSP.queries
	modified:   doc/src/pgRouting-concepts.rst
	modified:   doc/tsp/TSP-family.rst
	modified:   doc/tsp/pgr_TSP.rst

Fixing spelling & using new names
	modified:   include/c_types/pickDeliver/pickDeliveryOrders_t.h
	modified:   include/c_types/pickDeliver/vehicle_t.h
	modified:   include/tsp/pgr_tsp.hpp

Reorganizing TSP directory
	modified:   sql/tsp/TSP.sql
	new file:   sql/tsp/_TSP.sql
	new file:   sql/tsp/_TSPeuclidean.sql

Current signatures
	modified:   sql/sigs/pgrouting--3.0.0.sig

pgTap tests
* New tests
	new file:   pgtap/tsp/TSPeuclidean/illegal_values.sql
	new file:   pgtap/tsp/TSPeuclidean/innerQuery.sql
	new file:   pgtap/tsp/TSPeuclidean/types_check.sql
* renaming old test
	renamed:    pgtap/tsp/no_crash_test-eucledianTSP.sql -> pgtap/tsp/TSPeuclidean/no_crash_test.sql
* Deleting no longer used test
	deleted:    pgtap/tsp/pgr_eucledianTSP_types_check.sql

Documentation queries
* Fixing filenames
	renamed:    test/tsp/doc-pgr_TSP-windows.test.sql -> test/tsp/doc-pgr_TSP.test.sql
	renamed:    test/tsp/doc-pgr_eucledianTSP.result -> test/tsp/doc-pgr_TSPeuclidean.result
	renamed:    test/tsp/doc-pgr_TSP-windows.result -> test/tsp/win-pgr_TSP.result
	renamed:    test/tsp/doc-pgr_TSP-mac.test.sql -> test/tsp/win-pgr_TSP.test.sql
* Using correct spelling inside files
	modified:   test/tsp/development/gr9882-tsp.test.sql
	modified:   test/tsp/development/qa194-tsp.test.sql
	modified:   test/tsp/development/wi29-tsp.result
	modified:   test/tsp/development/wi29-tsp.test.sql
	modified:   test/tsp/doc-pgr_TSP.result
	modified:   test/tsp/performance/dj38.sql
	modified:   test/tsp/performance/qa194.sql
	modified:   test/tsp/performance/wi29.sql
* New tests
	new file:   test/tsp/doc-pgr_TSPeuclidean.test.sql
* Using new file names
	modified:   test/tsp/test.conf
* Deleting unused tests
	deleted:    test/tsp/doc-pgr_TSP-mac.result
	deleted:    test/tsp/doc-pgr_eucledianTSP.test.sql
	deleted:    test/tsp/doc-tsp-mac.result
	deleted:    test/tsp/doc-tsp-mac.test.sql
	deleted:    test/tsp/doc-tsp-windows.result
	deleted:    test/tsp/doc-tsp-windows.test.sql

Reflect changes on transifex configuration
	modified:   .tx/config

Moving to legacy deprecated TSP signatures
	new file:   sql/legacy/tsp/TSPeucledian.sql
	renamed:    sql/tsp/_makeDistanceMatrix.sql -> sql/legacy/tsp/_makeDistanceMatrix.sql
	renamed:    sql/tsp/tsp_v2.0_coordinates.sql -> sql/legacy/tsp/tsp_v2.0_coordinates.sql
	renamed:    sql/tsp/tsp_v2.0_matrix.sql -> sql/legacy/tsp/tsp_v2.0_matrix.sql

Removing trailing spaces
	modified:   src/common/orders_input.c
	modified:   src/common/vehicles_input.c
cvvergara added a commit to cvvergara/pgrouting that referenced this issue Dec 31, 2018
* Updating NEWS and release notes to current changes
	modified:   NEWS
	modified:   doc/src/release_notes.rst
* Adjusting documentation
	modified:   doc/queries/doc-pgr_TSPannealing.queries
	modified:   doc/tsp/TSP-family.rst
	modified:   doc/tsp/pgr_TSPannealing.rst
* Renaming files
	renamed:    include/drivers/tsp/euclideanTSP_driver.h -> include/drivers/tsp/TSPannealingEuclidean_driver.h
	renamed:    include/drivers/tsp/newTSP_driver.h -> include/drivers/tsp/TSPannealing_driver.h
	renamed:    pgtap/tsp/TSPeuclidean/illegal_values.sql -> pgtap/tsp/TSPannealing/coordinates-illegal_values.sql
	renamed:    pgtap/tsp/TSPeuclidean/no_crash_test.sql -> pgtap/tsp/TSPannealing/coordinates-no_crash_test.sql
	renamed:    pgtap/tsp/TSPeuclidean/innerQuery.sql -> pgtap/tsp/TSPannealing/innerQuery.sql
	renamed:    pgtap/tsp/pgr_TSP_types_check.sql -> pgtap/tsp/TSPannealing/matrix-illegal_values.sql
	renamed:    pgtap/tsp/no_crash_test-tsp.sql -> pgtap/tsp/TSPannealing/matrix-no_crash_test.sql
	renamed:    pgtap/tsp/TSPeuclidean/types_check.sql -> pgtap/tsp/TSPannealing/types_check.sql
	renamed:    src/tsp/euclideanTSP.c -> src/tsp/TSPannealing.c
	renamed:    src/tsp/euclideanTSP_driver.cpp -> src/tsp/TSPannealingEuclidean_driver.cpp
	renamed:    src/tsp/TSP_driver.cpp -> src/tsp/TSPannealing_driver.cpp
* Updating signatures
	modified:   sql/sigs/pgrouting--3.0.0.sig
* Function name pgr_TSPannealing
	modified:   sql/tsp/TSPannealing.sql
	modified:   sql/tsp/_TSPannealing.sql
* Adjustment for reading both SQL
	modified:   src/common/coordinates_input.c
	modified:   src/common/matrixRows_input.c
* Documentation queries adjustment
	modified:   test/tsp/doc-pgr_TSPannealing.result
	modified:   test/tsp/doc-pgr_TSPannealing.test.sql
	modified:   test/tsp/test.conf
* Deleting unusedd files
	deleted:    doc/queries/doc-pgr_TSPannealingEuclidean.queries
	deleted:    doc/tsp/pgr_TSPannealingEuclidean.rst
	deleted:    sql/tsp/TSPannealingEuclidean.sql
	deleted:    sql/tsp/_TSPannealingEuclidean.sql
	deleted:    src/tsp/TSP.c
* Adjusting build to current files
	modified:   doc/tsp/CMakeLists.txt
	modified:   doc/queries/CMakeLists.txt
	modified:   sql/tsp/CMakeLists.txt
	modified:   src/tsp/CMakeLists.txt
@cvvergara
Copy link
Member

I have ready
Option A, B, & D in PR so we can decide

@dkastl
Copy link
Member Author

dkastl commented Jan 19, 2019

Where is Option C? ;-)

I somehow find the solution without euclideanor annealing to be part of the function name the best looking one.

@cvvergara
Copy link
Member

Because that is the least of my preferences I didnt make one :(

Leave for the future the implementation of other algorithms that approximate a solution to TSP
Internally figure out if the query gives (id,x,y) or if it gives (start_vid, end_vid, agg_cost) as data
Then the name euclidean can be avoided.

I prefer to work it out in the present.

@cvvergara
Copy link
Member

As the start option B I will merge

cvvergara added a commit that referenced this issue Feb 25, 2019
@cvvergara
Copy link
Member

PR was merged, the name change iwith correct spelling is done

cvvergara added a commit to cvvergara/pgrouting that referenced this issue Aug 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

3 participants