Geometry package:GSoC17: Difference between revisions

Jump to navigation Jump to search
 
(9 intermediate revisions by the same user not shown)
Line 18: Line 18:
   1. Incorporating Clipper native oct interface instead of mex.
   1. Incorporating Clipper native oct interface instead of mex.
   2. Adding new [http://www4.ujaen.es/~fmartin/bool_op.html algorithm] as per the paper of F. Martínez, A.J. Rueda, F.R. Feito
   2. Adding new [http://www4.ujaen.es/~fmartin/bool_op.html algorithm] as per the paper of F. Martínez, A.J. Rueda, F.R. Feito
 
  3. Improve the already implemented scripts ispolyccw, poly2ccw, poly2cw, polyjoin, polysplit, and ensure that they are compatible with MATLAB.
  4. Devise an automated way to ensure that the functions which are in geometry package repo are synced with those in [https://github.com/kakila/matGeom matGeom].


== Workplan ==
== Workplan ==
Line 54: Line 55:
4. The output of the cpp code will be passed onto the m script which will handle the necessary processings before returning it as final result.
4. The output of the cpp code will be passed onto the m script which will handle the necessary processings before returning it as final result.


* '''Expected Challenges : '''
1. Handling '''overlapping edges''' seems to be a bit tedious with this algorithm. It will surely be a challenge.
===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.
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 reset --hard FETCH_HEAD
  - git clean -df
  This will ensure that your local repo is exactly same as your current version of matGeom. Here, we are doing hard reset because when we apply folder structure change script (next step), it might have changed its structure.
2. run the following octave command.
  - rmdir("dummyGeom/deprecated","s");
  - copyfile("dummyMatGeom/matGeom/deprecated","dummyGeom/");
  - copyfile("dummyMatGeom/matGeom", "dummyGeom/");
  - rmdir("dummyGeom/inst","s");
  - rename("dummyGeom/matGeom","dummyGeom/inst");
  This will simply replace the scripts of geometry with those of matGeom. Don't worry, we are not going to push this  whole matGeom script folder onto our geometry repo.We'll now commit and push only those scripts which have been modified and the rest of scripts will remain as it is, in the remote repository(geometry branch).
3. Now, go to local geometry directory (dummyGeom) and run following command.
  - git diff --name-only --diff-filter=M | xargs git add
  - git commit -m "synced with matGeom"
  - git push origin master:geometry
  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 resetting it from the remote geometry branch.
  - git fetch origin geometry
  - git reset --hard origin/geometry
* '''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.


=== Discoveries ===
=== Discoveries ===
26

edits

Navigation menu