Changeset 24a5e0 for src/Descriptors


Ignore:
Timestamp:
Feb 26, 2010, 12:40:52 PM (15 years ago)
Author:
Tillmann Crueger <crueger@…>
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:
1f2217
Parents:
7042f45
Message:

Added -Wall flag and fixed several small hickups

Location:
src/Descriptors
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • src/Descriptors/AtomDescriptor.cpp

    r7042f45 r24a5e0  
    9797{}
    9898
    99 bool AtomAllDescriptor_impl::predicate(std::pair<int,atom*>){
     99bool AtomAllDescriptor_impl::predicate(std::pair<atomId_t,atom*>){
    100100  return true;
    101101}
    … …  
    111111{}
    112112
    113 bool AtomNoneDescriptor_impl::predicate(std::pair<int,atom*>){
     113bool AtomNoneDescriptor_impl::predicate(std::pair<atomId_t,atom*>){
    114114  return false;
    115115}
    … …  
    129129{}
    130130
    131 bool AtomAndDescriptor_impl::predicate(std::pair<int,atom*> atom){
     131bool AtomAndDescriptor_impl::predicate(std::pair<atomId_t,atom*> atom){
    132132  return lhs->predicate(atom) && rhs->predicate(atom);
    133133}
    … …  
    145145}
    146146
    147 bool AtomOrDescriptor_impl::predicate(std::pair<int,atom*> atom){
     147bool AtomOrDescriptor_impl::predicate(std::pair<atomId_t,atom*> atom){
    148148  return lhs->predicate(atom) || rhs->predicate(atom);
    149149}
    … …  
    165165}
    166166
    167 bool AtomNotDescriptor_impl::predicate(std::pair<int,atom*> atom){
     167bool AtomNotDescriptor_impl::predicate(std::pair<atomId_t,atom*> atom){
    168168 return !(arg->predicate(atom));
    169169}

  • src/Descriptors/AtomDescriptor_impl.hpp

    r7042f45 r24a5e0  
    1414  virtual ~AtomDescriptor_impl();
    1515
    16   virtual bool predicate(std::pair<int,atom*>)=0;
     16  virtual bool predicate(std::pair<atomId_t,atom*>)=0;
    1717
    1818protected:
    … …  
    2828  AtomAllDescriptor_impl();
    2929  virtual ~AtomAllDescriptor_impl();
    30   virtual bool predicate(std::pair<int,atom*>);
     30  virtual bool predicate(std::pair<atomId_t,atom*>);
    3131};
    3232
    … …  
    3535  AtomNoneDescriptor_impl();
    3636  virtual ~AtomNoneDescriptor_impl();
    37   virtual bool predicate(std::pair<int,atom*>);
     37  virtual bool predicate(std::pair<atomId_t,atom*>);
    3838};
    3939
    … …  
    4545  AtomAndDescriptor_impl(AtomDescriptor::impl_ptr _lhs, AtomDescriptor::impl_ptr _rhs);
    4646  ~AtomAndDescriptor_impl();
    47   virtual bool predicate(std::pair<int,atom*>);
     47  virtual bool predicate(std::pair<atomId_t,atom*>);
    4848
    4949private:
    … …  
    5757  AtomOrDescriptor_impl(AtomDescriptor::impl_ptr _lhs, AtomDescriptor::impl_ptr _rhs);
    5858  virtual ~AtomOrDescriptor_impl();
    59   virtual bool predicate(std::pair<int,atom*>);
     59  virtual bool predicate(std::pair<atomId_t,atom*>);
    6060
    6161private:
    … …  
    7070  virtual ~AtomNotDescriptor_impl();
    7171
    72   virtual bool predicate(std::pair<int,atom*>);
     72  virtual bool predicate(std::pair<atomId_t,atom*>);
    7373
    7474private:

  • src/Descriptors/AtomIdDescriptor.cpp

    r7042f45 r24a5e0  
    2121{}
    2222
    23 bool AtomIdDescriptor_impl::predicate(std::pair<int,atom*> atom) {
     23bool AtomIdDescriptor_impl::predicate(std::pair<atomId_t,atom*> atom) {
    2424  return atom.first==id;
    2525}

  • src/Descriptors/AtomIdDescriptor_impl.hpp

    r7042f45 r24a5e0  
    1010  virtual ~AtomIdDescriptor_impl();
    1111
    12   bool predicate(std::pair<int,atom*> atom);
     12  bool predicate(std::pair<atomId_t,atom*> atom);
    1313
    1414protected:

  • src/Descriptors/AtomTypeDescriptor.cpp

    r7042f45 r24a5e0  
    2020{}
    2121
    22 bool AtomTypeDescriptor_impl::predicate(std::pair<int,atom*> atom) {
     22bool AtomTypeDescriptor_impl::predicate(std::pair<atomId_t,atom*> atom) {
    2323  return (atom.second->getType()==type);
    2424}

  • src/Descriptors/AtomTypeDescriptor_impl.hpp

    r7042f45 r24a5e0  
    1717  virtual ~AtomTypeDescriptor_impl();
    1818
    19   bool predicate(std::pair<int,atom*> atom);
     19  bool predicate(std::pair<atomId_t,atom*> atom);
    2020private:
    2121  element *type;
Note: See TracChangeset for help on using the changeset viewer.