26
edits
Geometry package:GSoC17: Difference between revisions
Jump to navigation
Jump to search
→Syncing matGeom and geometry
PiyushJain (talk | contribs) |
PiyushJain (talk | contribs) |
||
| (6 intermediate revisions by the same user not shown) | |||
| Line 61: | Line 61: | ||
===Syncing matGeom and geometry=== | ===Syncing matGeom and geometry=== | ||
The goal is to devise a somewhat automated way to ensure that the functions which are there in geometry are synced with those in matGeom without manually checking the edits. | The goal is to devise a somewhat automated way to ensure that the functions which are there in geometry are synced with those in matGeom without manually checking the edits. | ||
To achieve this, first a workaround is implemented on a dummy repository [https://github.com/piyush-jain1/dummyMatGeom/ dummyMatGeom]. Its master branch is matGeom (dummy) and there is another branch (named geometry) is created which contains geometry package (dummy). | |||
1. go to the local dummyMatGeom directory and pull upstream (dummy matGeom) using these commands : | To achieve this, first a workaround is implemented on a dummy repository [https://github.com/piyush-jain1/dummyMatGeom/ dummyMatGeom]. Its master branch is matGeom (dummy) and there is another branch (named geometry) is created which contains geometry package (dummy). | ||
To test the entire procedure, go to the dummy repository [https://github.com/piyush-jain1/dummyMatGeom/ dummyMatGeom] , pull both branches in different folders, say "dummyMatGeom" for master branch and "dummyGeom" for geometry branch. | |||
Then follow the given steps. | |||
1. go to the local dummyMatGeom directory (named dummyMatGeom) and pull upstream (dummy matGeom) using these commands : | |||
- git fetch origin master | - git fetch origin master | ||
- git reset --hard FETCH_HEAD | - git reset --hard FETCH_HEAD | ||
| Line 70: | Line 74: | ||
2. run the following octave command. | 2. run the following octave command. | ||
- rmdir("dummyGeom/deprecated","s"); | - rmdir("dummyGeom/deprecated","s"); | ||
- | - copyfile("dummyMatGeom/matGeom/deprecated","dummyGeom/"); | ||
- | - copyfile("dummyMatGeom/matGeom", "dummyGeom/"); | ||
- rmdir("dummyGeom/inst","s"); | - rmdir("dummyGeom/inst","s"); | ||
- rename("dummyGeom/matGeom","dummyGeom/inst"); | - rename("dummyGeom/matGeom","dummyGeom/inst"); | ||
| Line 82: | Line 86: | ||
This will sync the scripts which were already present in the geometry branch with those of the matGeom branch without disturbing other scripts. | This will sync the scripts which were already present in the geometry branch with those of the matGeom branch without disturbing other scripts. | ||
4. Now, update your local geometry repo by | 4. Now, update your local geometry repo by resetting it from the remote geometry branch. | ||
- git | - git fetch origin geometry | ||
- git reset --hard origin/geometry | |||
* '''Challenges : ''' | * '''Challenges : ''' | ||
Clearly, the above procedure will only sync the script of the function, not it's tests and demo, which are in separate folders in a Matlab package structure. Even if we try to concatenate their corresponding test/demo scripts with the function scripts (as it is in an octave package structure), there will be discrepancies because the notion or writing tests for octave and matlab packages are quite different. The way octave allows tests to work is unique to octave as explained [http://wiki.octave.org/FAQ#What_features_are_unique_to_Octave.3F here]. SO, we can't simply concatenate the Matlab test scripts with the functions. | Clearly, the above procedure will only sync the script of the function, not it's tests and demo, which are in separate folders in a Matlab package structure. Even if we try to concatenate their corresponding test/demo scripts with the function scripts (as it is in an octave package structure), there will be discrepancies because the notion or writing tests for octave and matlab packages are quite different. The way octave allows tests to work is unique to octave as explained [http://wiki.octave.org/FAQ#What_features_are_unique_to_Octave.3F here]. SO, we can't simply concatenate the Matlab test scripts with the functions. | ||
=== Discoveries === | === Discoveries === | ||