Changeset f4a863

Timestamp:

Sep 26, 2012, 5:24:33 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

5d4179f

Parents:

9e2737

git-author:

Gregor Bollerhey <bollerhe@…> (06/22/12 15:41:24)

git-committer:

Frederik Heber <heber@…> (09/26/12 17:24:33)

Message:

Implemented getLineIntersections.

Needs testing!

File:

• src/Shapes/BaseShapes.cpp (modified) (1 diff)

src/Shapes/BaseShapes.cpp

@@ -83 +83 @@
 
 LineSegmentSet Cylinder_impl::getLineIntersections(const Line &line) const {
-    // TODO
-        ASSERT(0, "Cylinder_impl::getLineIntersections - not implemented.");
+    const Vector origin = line.getOrigin();
+    const Vector direction = line.getDirection();
+    
+    const Vector e(direction[0], direction[1], 0.0);
+    const Vector f(origin[0], origin[1], 0.0);
+    const double A = e.ScalarProduct(e);
+    const double B = 2.0*e.ScalarProduct(f);
+    const double C = f.ScalarProduct(f) - 1.0;
+
+    std::vector<double> solutions;
+
+    // Common routine to solve quadratic quations, anywhere?
+    const double neg_p_half = -B/(2.0*A);
+    const double q = C/A;
+    const double radicant = neg_p_half*neg_p_half-q;
+
+    if (radicant > 0.0) {
+        const double root = sqrt(radicant);
+        solutions.push_back(neg_p_half+root);
+        const double sln2 = neg_p_half-root;
+        if (sln2 != solutions.back())
+            solutions.push_back(sln2);
+    }
+
+    // Now get parameter for intersection with z-Planes.
+    const double origin_z = origin[2];
+    const double dir_z = direction[2];
+
+    if (dir_z != 0.0) {
+        solutions.push_back((-1.0-origin_z)/dir_z);
+        solutions.push_back((1.0-origin_z)/dir_z);
+    }
+
+    // Calculate actual vectors from obtained parameters and check,
+    // if they are actual intersections.
+    std::vector<Vector> intersections;
+
+    for(unsigned int i=0; i<solutions.size(); i++) {
+        const Vector check_me(origin + direction*solutions[i]);
+        if (isOnSurface(check_me))
+            intersections.push_back(check_me);
+    }
+
+    LineSegmentSet result(line);
+    if (intersections.size()==2)
+        result.insert(LineSegment(intersections[0], intersections[1]));
+    return result;
 }