Hi Tharindu,<br><br>Did you get merge permissions for the main vtk repo (<a href="http://www.vtk.org/Wiki/VTK/Git#Pushing">http://www.vtk.org/Wiki/VTK/Git#Pushing</a>)? If not that may be it. If that's set then you should just be able to use the aliases "git stage-push" then "git stage-merge" as long as you're on the cell tree locator branch you want to merge in. If neither of them solve your problem you may have to give more details about the error message.<br>
<br>Andy<br><br><div class="gmail_quote">On Wed, Aug 10, 2011 at 7:10 PM, Tharindu De Silva <span dir="ltr"><<a href="mailto:tsameera1@gmail.com">tsameera1@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
Hi Andy,<div><br></div><div> I got a permission denied error when I tried to merge that from git bash. I tried the ssh <a href="mailto:git@vtk.org" target="_blank">git@vtk.org</a> stage VTK merge CellTreeLocator command. Do I have the permission to do this or is there an alternative way.</div>
<div><br></div><div>Thanks,</div><div>Tharindu<div><div></div><div class="h5"><br><br><div class="gmail_quote">On Wed, Aug 10, 2011 at 9:52 AM, Andy Bauer <span dir="ltr"><<a href="mailto:andy.bauer@kitware.com" target="_blank">andy.bauer@kitware.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">I checked out the patch and I'm fine with it. I also agree with John that it's ready to be merged into VTK. Tharindu, Jeff tells me 8/15 is your last official day so I'd say try to add the patch and merge this into the main repo ASAP so that you can monitor the dashboards for a day or two and make appropriate fixes. Then if time allows I'd recommend:<br>
<br>1) add in an example as I emailed about earlier<br><br>2) do some profiling of the locator to see if you can improve it's performance as the key to its use will be how fast it is<br><br>3) do some performance comparison tests with other cell locators and email the VTK developers and users list giving results.<br>
<br>This may be too much to get done before 8/15 but I figured that if all this got done it would be a nice wrap-up for the good work that you've done as well as getting it used in other parts of VTK to improve performance.<br>
<br>Thanks,<br><font color="#888888">Andy</font><div><div></div><div><br><br><div class="gmail_quote">On Wed, Aug 10, 2011 at 6:20 AM, Biddiscombe, John A. <span dir="ltr"><<a href="mailto:biddisco@cscs.ch" target="_blank">biddisco@cscs.ch</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div link="blue" vlink="purple" lang="EN-GB">
<div>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D">PS.<u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D"><u></u> <u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D">I have been playing with the locator quite a bit, and if the kitware guys are happy with the style, then I’d like to recommend it for merging into the next
release.<u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D"><u></u> <u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D">Thanks<u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D"><u></u> <u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D">JB<u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D"><u></u> <u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D"><u></u> <u></u></span></p>
<div>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b><span style="font-size:10.0pt" lang="EN-US">From:</span></b><span style="font-size:10.0pt" lang="EN-US"> <a href="mailto:vtk-developers-bounces@vtk.org" target="_blank">vtk-developers-bounces@vtk.org</a> [mailto:<a href="mailto:vtk-developers-bounces@vtk.org" target="_blank">vtk-developers-bounces@vtk.org</a>]
<b>On Behalf Of </b>Biddiscombe, John A.<br>
<b>Sent:</b> 10 August 2011 12:10</span></p><div><br>
<b>To:</b> Tharindu De Silva; Andy Bauer; VTK Developers<br>
</div><b>Subject:</b> [vtk-developers] corrected-patch: Cell Tree Locator Update<u></u><u></u><p></p>
</div>
</div><div><div></div><div>
<p class="MsoNormal"><u></u> <u></u></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D">This patch is the correct one. My apologies.<u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D"><u></u> <u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D">JB<u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D"><u></u> <u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D"><u></u> <u></u></span></p>
<div>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b><span style="font-size:10.0pt" lang="EN-US">From:</span></b><span style="font-size:10.0pt" lang="EN-US"> <a href="mailto:vtk-developers-bounces@vtk.org" target="_blank">vtk-developers-bounces@vtk.org</a> [mailto:<a href="mailto:vtk-developers-bounces@vtk.org" target="_blank">vtk-developers-bounces@vtk.org</a>]
<b>On Behalf Of </b>Biddiscombe, John A.<br>
<b>Sent:</b> 10 August 2011 09:50<br>
<b>To:</b> Tharindu De Silva; Andy Bauer; VTK Developers<br>
<b>Subject:</b> Re: [vtk-developers] Cell Tree Locator Update<u></u><u></u></span></p>
</div>
</div>
<p class="MsoNormal"><u></u> <u></u></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D">The virtual call in the destructor was my fault. Sorry about that. I am aware of the badness of virtual calls in constructors and destructors. I think it’s
safe in this case, because it just frees some pointers and sets them to null, the base class does the same, but doesn’t know about one pointer, so worst case scenario is a memory leak (but it’s hard to see this happening with your change).<u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D"><u></u> <u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D">The class does not honour the Max cells per node variable, it declares it’s own one and ignore the one inherited from abstract cell locator. the patch attached
fixes that and also cleans up a doc entry which was nonsense.<u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D"><u></u> <u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D">JB<u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D">Apologies I can’t use Gerrit due to inability to get an openID<u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D"><u></u> <u></u></span></p>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b><span style="font-size:10.0pt" lang="EN-US">From:</span></b><span style="font-size:10.0pt" lang="EN-US"> Tharindu De Silva [mailto:<a href="mailto:tsameera1@gmail.com" target="_blank">tsameera1@gmail.com</a>]
<br>
<b>Sent:</b> 09 August 2011 23:44<br>
<b>To:</b> Andy Bauer; VTK Developers; Biddiscombe, John A.<br>
<b>Subject:</b> Re: [vtk-developers] Cell Tree Locator Update<u></u><u></u></span></p>
</div>
<p class="MsoNormal"><u></u> <u></u></p>
<p class="MsoNormal" style="margin-bottom:12.0pt"><u></u> <u></u></p>
<div>
<p class="MsoNormal">On Tue, Aug 9, 2011 at 5:43 PM, Tharindu De Silva <<a href="mailto:tsameera1@gmail.com" target="_blank">tsameera1@gmail.com</a>> wrote:<u></u><u></u></p>
<p class="MsoNormal">Hi Andy,<u></u><u></u></p>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
<div>
<p class="MsoNormal"> Thank you for the comments. Sorry I didn't notice the trailing white spaces. <u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"> <u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"> By 'example' i meant the test, I will go through the wiki page and try to make an example. <u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
<div>
<p class="MsoNormal">Thanks,<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
<div>
<p class="MsoNormal"><span style="color:#888888">Tharindu<u></u><u></u></span></p>
</div>
<div>
<div>
<div>
<div>
<p class="MsoNormal">On Tue, Aug 9, 2011 at 4:44 PM, Andy Bauer <<a href="mailto:andy.bauer@kitware.com" target="_blank">andy.bauer@kitware.com</a>> wrote:<u></u><u></u></p>
<p class="MsoNormal">Hi Tharindu,<br>
<br>
I cleaned up the code a bit doing things like getting rid of trailing whitespace (gerrit will highlight this as red to warn about it), bracketed some if/else conditions, and added a std::vector to take care of some dynamic memory allocation. I also got rid
of the compile warnings in the test. These changes are at:<br>
<a href="http://review.source.kitware.com/#change,2418" target="_blank">http://review.source.kitware.com/#change,2418</a><br>
<br>
One thing to note is that I made it more apparent that a virtual function was getting called in the destructor. In general this is bad practice (see
<a href="http://www.artima.com/cppsource/nevercall.html" target="_blank">http://www.artima.com/cppsource/nevercall.html</a>).<br>
<br>
I was able to run the test successfully. In your previous email you mentioned an example. Did you mean test? I couldn't find anything called CellTreeLocator.cxx except for the test. If you wanted to add in a different example, please check out:
<a href="http://www.vtk.org/Wiki/VTK/Examples" target="_blank">http://www.vtk.org/Wiki/VTK/Examples</a>. This is not required but I'd encourage you to do this to help other people better understand and utilize your code.<br>
<span style="color:#888888"><br>
Andy</span><u></u><u></u></p>
<div>
<div>
<p class="MsoNormal" style="margin-bottom:12.0pt"><u></u> <u></u></p>
<div>
<p class="MsoNormal">On Tue, Aug 9, 2011 at 11:23 AM, Tharindu De Silva <<a href="mailto:tsameera1@gmail.com" target="_blank">tsameera1@gmail.com</a>> wrote:<u></u><u></u></p>
<p class="MsoNormal">Hi,<u></u><u></u></p>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
<div>
<p class="MsoNormal"> I revert the renaming of internal variables to their original names and made a note on the code that they were derived from avtCellLocatorBIH class in VisIT, so that the people familiar with that code can make improvements. The current
code can be found in <a href="http://review.source.kitware.com/#change,2413" target="_blank">http://review.source.kitware.com/#change,2413</a>.<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
<div>
<p class="MsoNormal"> There is an example named CellTreeLocator.cxx at Filtering/Examples/Cxx. Please let me know if you encounter any bugs in running this.<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
<div>
<p class="MsoNormal">Thank you.<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal" style="margin-bottom:12.0pt"> <u></u><u></u></p>
<div>
<p class="MsoNormal">On Tue, Aug 2, 2011 at 5:08 PM, Biddiscombe, John A. <<a href="mailto:biddisco@cscs.ch" target="_blank">biddisco@cscs.ch</a>> wrote:<u></u><u></u></p>
<div>
<div>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D">I’m not sure that renaming all the internal variables from their original names was a good idea.</span><u></u><u></u></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D">The original code came from the visit avtXXX class and there’s a strong possibility that the visit developers will make changes/improvements
similar to the intersectBox type methods that I’m adding. </span><u></u><u></u></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D"> </span><u></u><u></u></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D">Renaming the internals serves no purpose other than to make it harder to sync our version with theirs.</span><u></u><u></u></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D"> </span><u></u><u></u></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D">I am aware that I have radical opinions about the dreadful kitware code style but for me this is an unnecessary barrier to future collaboration.</span><u></u><u></u></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D"> </span><u></u><u></u></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D">JB</span><u></u><u></u></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D"> </span><u></u><u></u></p>
<div style="border:none;border-top:solid windowtext 1.0pt;padding:3.0pt 0cm 0cm 0cm;border-color:-moz-use-text-color -moz-use-text-color">
<p class="MsoNormal"><b><span style="font-size:10.0pt" lang="EN-US">From:</span></b><span style="font-size:10.0pt" lang="EN-US"> Tharindu De Silva [mailto:<a href="mailto:tsameera1@gmail.com" target="_blank">tsameera1@gmail.com</a>]
<br>
<b>Sent:</b> 02 August 2011 18:18<br>
<b>To:</b> Biddiscombe, John A.; Andy Bauer; VTK Developers<br>
<b>Cc:</b> <a href="mailto:trshash@gmail.com" target="_blank">trshash@gmail.com</a></span><u></u><u></u></p>
<div>
<p class="MsoNormal"><br>
<b>Subject:</b> Re: [vtk-developers] Cell Tree Locator Update<u></u><u></u></p>
</div>
</div>
<p class="MsoNormal"> <u></u><u></u></p>
<p class="MsoNormal">Hi,<u></u><u></u></p>
<div>
<div>
<div>
<p class="MsoNormal"> <u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"> I did some formatting changes to the code according to vtk guidelines and added the patch given by John. The code can be found in <a href="http://review.source.kitware.com/#change,2362" target="_blank">http://review.source.kitware.com/#change,2362</a>.<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"> <u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">Some formatting still needs to be done.<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"> <u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">Helper classes, vtkCellTree and vtkCellTreeNode, are made public in the current version to make them accessible by sub-classing to test for additional functions implemented in vtkModifiedBSPTree.
This can be made protected after all the functions are available in vtkCellTreeLocator.<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"> <u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">The standard template library functions are used in this class that might need to be changed as well.<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"> <u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">Please let me know if you come across any other bugs or if there are improvements that can be made to this code.<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"> <u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">Thank you,<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"> <u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">Tharindu <u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"> <u></u><u></u></p>
<div>
<p class="MsoNormal">On Fri, Jul 29, 2011 at 4:02 PM, Biddiscombe, John A. <<a href="mailto:biddisco@cscs.ch" target="_blank">biddisco@cscs.ch</a>> wrote:<u></u><u></u></p>
<div>
<div>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D">I’ve fixed the crash caused by a numeric overflow. some compilers might not mind and not cause the segfault – I believe the intent was
to allow the std:::numeric_limits max() to cause a large volume result which would exclude the bucket from consideration.</span><u></u><u></u></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D"> </span><u></u><u></u></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D">I’d added a check to stop it. Might be worth adding a few other tests as this class is new and we have little experience with it. I’ll
add one myself I think.</span><u></u><u></u></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D"> </span><u></u><u></u></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D">patch attached</span><u></u><u></u></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D"> </span><u></u><u></u></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D">JB</span><u></u><u></u></p>
<p class="MsoNormal"><span style="font-size:11.0pt;color:#1F497D"> </span><u></u><u></u></p>
</div>
</div>
<p class="MsoNormal" style="margin-bottom:12.0pt"><br>
_______________________________________________<br>
Powered by <a href="http://www.kitware.com" target="_blank">www.kitware.com</a><br>
<br>
Visit other Kitware open-source projects at <a href="http://www.kitware.com/opensource/opensource.html" target="_blank">
http://www.kitware.com/opensource/opensource.html</a><br>
<br>
Follow this link to subscribe/unsubscribe:<br>
<a href="http://www.vtk.org/mailman/listinfo/vtk-developers" target="_blank">http://www.vtk.org/mailman/listinfo/vtk-developers</a><u></u><u></u></p>
</div>
<p class="MsoNormal"> <u></u><u></u></p>
</div>
</div>
</div>
</div>
</div>
</div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
</div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
</div>
</div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
</div>
</div>
</div>
<p class="MsoNormal"><u></u> <u></u></p>
</div></div></div>
</div>
</blockquote></div><br>
</div></div></blockquote></div><br></div></div></div>
</blockquote></div><br>