Changeset e9bdef
- Timestamp:
- Mar 17, 2013, 6:27:37 PM (13 years ago)
- 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, Candidate_v1.7.0, 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:
- 105b72
- Parents:
- 8c9049
- git-author:
- Frederik Heber <heber@…> (02/24/13 19:09:59)
- git-committer:
- Frederik Heber <heber@…> (03/17/13 18:27:37)
- Files:
-
- 25 edited
-
src/Analysis/analysis_correlation.cpp (modified) (1 diff)
-
src/Analysis/analysis_correlation.hpp (modified) (1 diff)
-
src/Analysis/unittests/AnalysisPairCorrelationUnitTest.cpp (modified) (1 diff)
-
tests/regression/Analysis/DipoleAngularCorrelation-PeriodicBoundaries/post/water_values_Y.0001.dat (modified) (1 diff)
-
tests/regression/Analysis/DipoleAngularCorrelation-PeriodicBoundaries/post/water_values_Y.0003.dat (modified) (1 diff)
-
tests/regression/Analysis/DipoleAngularCorrelation-PeriodicBoundaries/post/water_values_Y.0007.dat (modified) (1 diff)
-
tests/regression/Analysis/DipoleAngularCorrelation-PeriodicBoundaries/post/water_values_Y.0008.dat (modified) (1 diff)
-
tests/regression/Analysis/DipoleAngularCorrelation-PeriodicBoundaries/post/water_values_Y.0013.dat (modified) (1 diff)
-
tests/regression/Analysis/DipoleAngularCorrelation-PeriodicBoundaries/post/water_values_Y.0018.dat (modified) (1 diff)
-
tests/regression/Analysis/DipoleAngularCorrelation-PeriodicBoundaries/post/water_values_Y.0027.dat (modified) (1 diff)
-
tests/regression/Analysis/DipoleAngularCorrelation-PeriodicBoundaries/post/water_values_Y.0028.dat (modified) (1 diff)
-
tests/regression/Analysis/DipoleAngularCorrelation-PeriodicBoundaries/post/water_values_Y.0030.dat (modified) (1 diff)
-
tests/regression/Analysis/DipoleAngularCorrelation-PeriodicBoundaries/post/water_values_Y.0033.dat (modified) (1 diff)
-
tests/regression/Analysis/DipoleAngularCorrelation-PeriodicBoundaries/post/water_values_Y.0035.dat (modified) (1 diff)
-
tests/regression/Analysis/DipoleAngularCorrelation/post/water_values_Y.0001.dat (modified) (1 diff)
-
tests/regression/Analysis/DipoleAngularCorrelation/post/water_values_Y.0003.dat (modified) (1 diff)
-
tests/regression/Analysis/DipoleAngularCorrelation/post/water_values_Y.0007.dat (modified) (1 diff)
-
tests/regression/Analysis/DipoleAngularCorrelation/post/water_values_Y.0008.dat (modified) (1 diff)
-
tests/regression/Analysis/DipoleAngularCorrelation/post/water_values_Y.0013.dat (modified) (1 diff)
-
tests/regression/Analysis/DipoleAngularCorrelation/post/water_values_Y.0018.dat (modified) (1 diff)
-
tests/regression/Analysis/DipoleAngularCorrelation/post/water_values_Y.0027.dat (modified) (1 diff)
-
tests/regression/Analysis/DipoleAngularCorrelation/post/water_values_Y.0028.dat (modified) (1 diff)
-
tests/regression/Analysis/DipoleAngularCorrelation/post/water_values_Y.0030.dat (modified) (1 diff)
-
tests/regression/Analysis/DipoleAngularCorrelation/post/water_values_Y.0033.dat (modified) (1 diff)
-
tests/regression/Analysis/DipoleAngularCorrelation/post/water_values_Y.0035.dat (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
src/Analysis/analysis_correlation.cpp
r8c9049 re9bdef 232 232 else 233 233 LOG(2, "INFO: Both vectors (almost) coincide, numerically unstable, angle set to zero."); 234 // we print six digits, hence round up to six digit precision 235 const double precision = 1e-6; 236 angle = precision*floor(angle/precision); 234 237 LOG(1,"INFO: Resulting relative angle for molecule " << _mol->getName() 235 238 << " is " << angle << "."); -
src/Analysis/analysis_correlation.hpp
r8c9049 re9bdef 153 153 end = BinEnd; 154 154 } 155 // limit precision of start and end bin to 6 digits 156 const double precision = 1e-6/BinWidth; 157 end = precision*floor(end/precision); 158 start = precision*floor(start/precision); 155 159 for (int runner = 0; runner <= ceil((end-start)/BinWidth); runner++) 156 160 outmap->insert( pair<double, int> ((double)runner*BinWidth+start, 0) ); -
src/Analysis/unittests/AnalysisPairCorrelationUnitTest.cpp
r8c9049 re9bdef 137 137 //OutputCorrelation ( binmap ); 138 138 tester = binmap->begin(); 139 CPPUNIT_ASSERT_EQUAL( sqrt(2.), tester->first ); 139 // output precision of map is 6 digits 140 CPPUNIT_ASSERT( fabs(sqrt(2.)-tester->first) < 1e-5); 140 141 CPPUNIT_ASSERT_EQUAL( 6, tester->second ); 141 142 }; -
tests/regression/Analysis/DipoleAngularCorrelation-PeriodicBoundaries/post/water_values_Y.0001.dat
r8c9049 re9bdef 1 1 BinStart BinCenter BinEnd FirstAtomOfMolecule 2 19.98835 50 0 O1,(0.005,0,-0.029)2 19.988354 0 0 O1,(0.005,0,-0.029) -
tests/regression/Analysis/DipoleAngularCorrelation-PeriodicBoundaries/post/water_values_Y.0003.dat
r8c9049 re9bdef 1 1 BinStart BinCenter BinEnd FirstAtomOfMolecule 2 39.949 50 0 O1,(0.019,0,-0.054)2 39.949499 0 0 O1,(0.019,0,-0.054) -
tests/regression/Analysis/DipoleAngularCorrelation-PeriodicBoundaries/post/water_values_Y.0007.dat
r8c9049 re9bdef 1 1 BinStart BinCenter BinEnd FirstAtomOfMolecule 2 79.86555 50 0 O1,(0.068,0,-0.083)2 79.865554 0 0 O1,(0.068,0,-0.083) -
tests/regression/Analysis/DipoleAngularCorrelation-PeriodicBoundaries/post/water_values_Y.0008.dat
r8c9049 re9bdef 1 1 BinStart BinCenter BinEnd FirstAtomOfMolecule 2 89.8951 50 0 O1,(0.083,0,-0.084)2 89.895149 0 0 O1,(0.083,0,-0.084) -
tests/regression/Analysis/DipoleAngularCorrelation-PeriodicBoundaries/post/water_values_Y.0013.dat
r8c9049 re9bdef 1 1 BinStart BinCenter BinEnd FirstAtomOfMolecule 2 139.8350 70 0 O1,(0.148,0,-0.055)2 139.83506 0 0 O1,(0.148,0,-0.055) -
tests/regression/Analysis/DipoleAngularCorrelation-PeriodicBoundaries/post/water_values_Y.0018.dat
r8c9049 re9bdef 1 1 BinStart BinCenter BinEnd FirstAtomOfMolecule 2 170.1188 50 0 O1,(0.167,0,0.014)2 170.11884 0 0 O1,(0.167,0,0.014) -
tests/regression/Analysis/DipoleAngularCorrelation-PeriodicBoundaries/post/water_values_Y.0027.dat
r8c9049 re9bdef 1 1 BinStart BinCenter BinEnd FirstAtomOfMolecule 2 80.18650 30 0 O1,(0.07,0,0.083)2 80.186502 0 0 O1,(0.07,0,0.083) -
tests/regression/Analysis/DipoleAngularCorrelation-PeriodicBoundaries/post/water_values_Y.0028.dat
r8c9049 re9bdef 1 1 BinStart BinCenter BinEnd FirstAtomOfMolecule 2 70.19809 80 0 O1,(0.056,0,0.079)2 70.198097 0 0 O1,(0.056,0,0.079) -
tests/regression/Analysis/DipoleAngularCorrelation-PeriodicBoundaries/post/water_values_Y.0030.dat
r8c9049 re9bdef 1 1 BinStart BinCenter BinEnd FirstAtomOfMolecule 2 50.26969 20 0 O1,(0.031,0,0.065)2 50.269691 0 0 O1,(0.031,0,0.065) -
tests/regression/Analysis/DipoleAngularCorrelation-PeriodicBoundaries/post/water_values_Y.0033.dat
r8c9049 re9bdef 1 1 BinStart BinCenter BinEnd FirstAtomOfMolecule 2 20.30924 40 0 O1,(0.005,0,0.03)2 20.309243 0 0 O1,(0.005,0,0.03) -
tests/regression/Analysis/DipoleAngularCorrelation-PeriodicBoundaries/post/water_values_Y.0035.dat
r8c9049 re9bdef 1 1 BinStart BinCenter BinEnd FirstAtomOfMolecule 2 0.31401 0010 0 O1,(-0,0,0.001)2 0.31401 0 0 O1,(-0,0,0.001) -
tests/regression/Analysis/DipoleAngularCorrelation/post/water_values_Y.0001.dat
r8c9049 re9bdef 1 1 BinStart BinCenter BinEnd FirstAtomOfMolecule 2 19.98835 50 0 O1,(5.005,5,4.971)2 19.988354 0 0 O1,(5.005,5,4.971) -
tests/regression/Analysis/DipoleAngularCorrelation/post/water_values_Y.0003.dat
r8c9049 re9bdef 1 1 BinStart BinCenter BinEnd FirstAtomOfMolecule 2 39.949 50 0 O1,(5.019,5,4.946)2 39.949499 0 0 O1,(5.019,5,4.946) -
tests/regression/Analysis/DipoleAngularCorrelation/post/water_values_Y.0007.dat
r8c9049 re9bdef 1 1 BinStart BinCenter BinEnd FirstAtomOfMolecule 2 79.86555 50 0 O1,(5.068,5,4.917)2 79.865554 0 0 O1,(5.068,5,4.917) -
tests/regression/Analysis/DipoleAngularCorrelation/post/water_values_Y.0008.dat
r8c9049 re9bdef 1 1 BinStart BinCenter BinEnd FirstAtomOfMolecule 2 89.8951 50 0 O1,(5.083,5,4.916)2 89.895149 0 0 O1,(5.083,5,4.916) -
tests/regression/Analysis/DipoleAngularCorrelation/post/water_values_Y.0013.dat
r8c9049 re9bdef 1 1 BinStart BinCenter BinEnd FirstAtomOfMolecule 2 139.8350 70 0 O1,(5.148,5,4.945)2 139.83506 0 0 O1,(5.148,5,4.945) -
tests/regression/Analysis/DipoleAngularCorrelation/post/water_values_Y.0018.dat
r8c9049 re9bdef 1 1 BinStart BinCenter BinEnd FirstAtomOfMolecule 2 170.1188 50 0 O1,(5.167,5,5.014)2 170.11884 0 0 O1,(5.167,5,5.014) -
tests/regression/Analysis/DipoleAngularCorrelation/post/water_values_Y.0027.dat
r8c9049 re9bdef 1 1 BinStart BinCenter BinEnd FirstAtomOfMolecule 2 80.18650 30 0 O1,(5.07,5,5.083)2 80.186502 0 0 O1,(5.07,5,5.083) -
tests/regression/Analysis/DipoleAngularCorrelation/post/water_values_Y.0028.dat
r8c9049 re9bdef 1 1 BinStart BinCenter BinEnd FirstAtomOfMolecule 2 70.19809 80 0 O1,(5.056,5,5.079)2 70.198097 0 0 O1,(5.056,5,5.079) -
tests/regression/Analysis/DipoleAngularCorrelation/post/water_values_Y.0030.dat
r8c9049 re9bdef 1 1 BinStart BinCenter BinEnd FirstAtomOfMolecule 2 50.26969 20 0 O1,(5.031,5,5.065)2 50.269691 0 0 O1,(5.031,5,5.065) -
tests/regression/Analysis/DipoleAngularCorrelation/post/water_values_Y.0033.dat
r8c9049 re9bdef 1 1 BinStart BinCenter BinEnd FirstAtomOfMolecule 2 20.30924 40 0 O1,(5.005,5,5.03)2 20.309243 0 0 O1,(5.005,5,5.03) -
tests/regression/Analysis/DipoleAngularCorrelation/post/water_values_Y.0035.dat
r8c9049 re9bdef 1 1 BinStart BinCenter BinEnd FirstAtomOfMolecule 2 0.31401 0010 0 O1,(5,5,5.001)2 0.31401 0 0 O1,(5,5,5.001)
Note:
See TracChangeset
for help on using the changeset viewer.
