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

Update the code with develop branch #869

Merged
merged 101 commits into from
Jul 5, 2017
Merged

Update the code with develop branch #869

merged 101 commits into from
Jul 5, 2017

Conversation

vidhan13j07
Copy link
Member

No description provided.

cvvergara and others added 30 commits June 6, 2017 12:49
@cvvergara
pick & deliver result doc, first proposal
72eba25
@cvvergara
updated code & tests to match new names vehicles_sql & stoprs_seq
1b0332c
@cvvergara
updating to recent sql-update-scripts files
596d846
@cvvergara
updating the pick & deliver results doc to match latest code
0e119a3
@cvvergara
added some TODO
23b0d0a
@cvvergara
chnging the ordering of the columns
8176567
@cvvergara
saving latest documentation
9403046
@thisisashukla
Fixing petite bug in contractGraph.c
96be0d8 
- This commit fixes a petite bug in contractGraph.c file in contraction directory.  
- Replaced `char` in `char *nulls;` with `bool` on line number 188
@cvvergara
Merge pull request pgRouting#817 from pgRouting/contraction_patch
4698704 
Fixing petite bug in contractGraph.c
@cvvergara
removing the vrppdtw documentation
c7191fa
@cvvergara
fixing merge conflicts
f713f01
@cvvergara
Merge branch 'develop' into doc/pickDeliver
2d30f4c
@cvvergara
added current signatrue to docs
cc8d139
@cvvergara
install.bat using latest postgis
5c0b677
@cvvergara
refining pick deliver documentation
547ec5f
@cvvergara
added links, reorganized the pick & delivery files
1504799
@cvvergara
fixed identation errors on pgRouting-concepts
1dfa3c2
@cvvergara
Adding debug to some mesages
93872f3
@cvvergara
adding wrapper for vrppdtw
64d96a0
@cvvergara
updated the cmakelists for correct name
a35029c
@cvvergara
adding the queries files
ed56279
@cvvergara
not generating queries for deprecated finction pgr_gsoc_vrppdtw
0c97659
@cvvergara
moved pgr_gsoc_vrppdtw tests to deprecated tests
2a8ffe3
@cvvergara
moved gsoc_vrppdtw.sql to deprecated directory
a17360e
@cvvergara
moved fixed some syntax errors
1b72e23
@cvvergara
moved the wraping code of pgr_gsoc_vrppdtw to deprecated
9e8070c
@cvvergara
changing the wrapper function name
1f6188d
@cvvergara
changing the wrapper function call
5dcda1b
@cvvergara
added deprecated message
035f0e4
@cvvergara
added deprecated comment
e567a80
cvvergara and others added 24 commits June 26, 2017 11:20
@cvvergara
making travis documentation tests as part of build tests
383a71b
@cvvergara
Merge pull request pgRouting#157 from cvvergara/improve/pgtap
8068b61 
Improve/pgtap
@cvvergara
braking the test in two files
d61cb57
@cvvergara
fixed some details on the Readme
67b3d39
@cvvergara
not compiling the C/C++ code of vrpOneDepot
1d774ea
@cvvergara
adding example to documentation of pgr_vrpOneDepot
e53164b
@cvvergara
adding the generated documentation of pgr_vrpOneDepot
2263d2e
@cvvergara
orginizing an example of pgr_vrpOneDepot
7e1915c
@cvvergara
fixing a typo on a file name
68bf3ff
@cvvergara
no name parameters on _pgr_vrpOneDepot
43e94b8
@cvvergara
no name parameters on _pgr_vrpOneDepot
6701a89
@cvvergara
Merge pull request pgRouting#159 from cvvergara/remove/unusedCode
cd908da 
Remove/unused code
@robe2
Do not overwrite msys set path. Just add to it. otherwise can not fin…
76e6435 
…d pg_prove and other things.
@robe2
Change to use pg_prove test. Try to use built in cmake.
49a6fb9
@robe2
Change to use pg_prove test. Try to use built in cmake.
25cf33b
@robe2
more fiddling with cmake
20a8c45
@robe2
more fiddling with cmake
9e99dfd
@robe2
fix path to pg_prove test script
dff44ee
@cvvergara
moving around stalled pgtap test on jenkins
a5faf45
@cvvergara
returning test to its correct place
b5785c0
@cvvergara
jenkins: on 32 bits use algorithm tester
bf30676
@cvvergara
jenkins: fixing a typo on last commit
38ed131
@cvvergara
Merge pull request pgRouting#864 from cvvergara/release/2.5
99406ab 
More changes on pickDeliver
@vidhan13j07
fix conflicts
1934e4d
@vidhan13j07 vidhan13j07 added this to the GSoC 2017 phase 2 milestone Jul 5, 2017
@vidhan13j07 vidhan13j07 self-assigned this Jul 5, 2017
@vidhan13j07 vidhan13j07 requested a review from cvvergara July 5, 2017 17:11
@vidhan13j07 vidhan13j07 merged commit 7f57125 into pgRouting:gsoc/rewritetrsp Jul 5, 2017
@vidhan13j07 vidhan13j07 mentioned this pull request Aug 17, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cvvergara cvvergara Awaiting requested review from cvvergara

Assignees

@vidhan13j07 vidhan13j07

Labels
TRSP
Projects
None yet
Milestone
GSoC 2017 phase 2
Development

Successfully merging this pull request may close these issues.
4 participants
@vidhan13j07 @cvvergara @thisisashukla @robe2