Changeset 9c1c89 for src/Shapes


Ignore:
Timestamp:
Aug 26, 2010, 1:28:45 PM (15 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:
0b2ce9
Parents:
d17f3d
Message:

FIX: all ...:getHomogeneousPointsOnSurface() now have size_t instead of int parameter.

Location:
src/Shapes
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • src/Shapes/BaseShapes.cpp

    rd17f3d r9c1c89  
    3737 * \param N number of points on surface
    3838 */
    39 std::vector<Vector> Sphere_impl::getHomogeneousPointsOnSurface(const int N) const {
     39std::vector<Vector> Sphere_impl::getHomogeneousPointsOnSurface(const size_t N) const {
    4040  std::vector<Vector> PointsOnSurface;
    4141
    … …  
    4545  double z = 1. - dz/2.;
    4646  Vector point;
    47   for (int ka = 0; ka<N; ka++){
     47  for (size_t ka = 0; ka<N; ka++){
    4848    const double r = sqrt(1.-z*z);
    4949    point.Zero();
    … …  
    7373 * \param N number of points on surface
    7474 */
    75 std::vector<Vector> Cuboid_impl::getHomogeneousPointsOnSurface(const int N) const {
     75std::vector<Vector> Cuboid_impl::getHomogeneousPointsOnSurface(const size_t N) const {
    7676  std::vector<Vector> PointsOnSurface;
    7777  ASSERT(false, "Cuboid_impl::getHomogeneousPointsOnSurface() not implemented yet");

  • src/Shapes/BaseShapes_impl.hpp

    rd17f3d r9c1c89  
    1313class Sphere_impl : public Shape_impl {
    1414  virtual bool isInside(const Vector &point);
    15   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const int N) const;
     15  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
    1616};
    1717
    1818class Cuboid_impl : public Shape_impl {
    1919  virtual bool isInside(const Vector &point);
    20   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const int N) const;
     20  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
    2121};
    2222

  • src/Shapes/Shape.cpp

    rd17f3d r9c1c89  
    3737}
    3838
    39 std::vector<Vector> Shape::getHomogeneousPointsOnSurface(const int N) const {
     39std::vector<Vector> Shape::getHomogeneousPointsOnSurface(const size_t N) const {
    4040  return impl->getHomogeneousPointsOnSurface(N);
    4141}
    … …  
    8787}
    8888
    89 std::vector<Vector> AndShape_impl::getHomogeneousPointsOnSurface(const int N) const {
     89std::vector<Vector> AndShape_impl::getHomogeneousPointsOnSurface(const size_t N) const {
    9090  std::vector<Vector> PointsOnSurface_lhs = lhs->getHomogeneousPointsOnSurface(N);
    9191  std::vector<Vector> PointsOnSurface_rhs = rhs->getHomogeneousPointsOnSurface(N);
    … …  
    122122}
    123123
    124 std::vector<Vector> OrShape_impl::getHomogeneousPointsOnSurface(const int N) const {
     124std::vector<Vector> OrShape_impl::getHomogeneousPointsOnSurface(const size_t N) const {
    125125  std::vector<Vector> PointsOnSurface_lhs = lhs->getHomogeneousPointsOnSurface(N);
    126126  std::vector<Vector> PointsOnSurface_rhs = rhs->getHomogeneousPointsOnSurface(N);
    … …  
    156156}
    157157
    158 std::vector<Vector> NotShape_impl::getHomogeneousPointsOnSurface(const int N) const {
     158std::vector<Vector> NotShape_impl::getHomogeneousPointsOnSurface(const size_t N) const {
    159159  // surfaces are the same, only normal direction is different
    160160  return arg->getHomogeneousPointsOnSurface(N);

  • src/Shapes/Shape.hpp

    rd17f3d r9c1c89  
    2727
    2828  bool isInside(const Vector &point) const;
    29   std::vector<Vector> getHomogeneousPointsOnSurface(const int N) const;
     29  std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
    3030
    3131  Shape &operator=(const Shape& rhs);

  • src/Shapes/ShapeOps.cpp

    rd17f3d r9c1c89  
    3939}
    4040
    41 std::vector<Vector> Resize_impl::getHomogeneousPointsOnSurface(const int N) const {
     41std::vector<Vector> Resize_impl::getHomogeneousPointsOnSurface(const size_t N) const {
    4242  std::vector<Vector> PointsOnSurface = arg->getHomogeneousPointsOnSurface(N);
    4343  for(std::vector<Vector>::iterator iter = PointsOnSurface.begin(); iter != PointsOnSurface.end(); ++iter) {
    … …  
    6565}
    6666
    67 std::vector<Vector> Translate_impl::getHomogeneousPointsOnSurface(const int N) const {
     67std::vector<Vector> Translate_impl::getHomogeneousPointsOnSurface(const size_t N) const {
    6868  std::vector<Vector> PointsOnSurface = arg->getHomogeneousPointsOnSurface(N);
    6969  for(std::vector<Vector>::iterator iter = PointsOnSurface.begin(); iter != PointsOnSurface.end(); ++iter) {
    … …  
    9999}
    100100
    101 std::vector<Vector> Stretch_impl::getHomogeneousPointsOnSurface(const int N) const {
     101std::vector<Vector> Stretch_impl::getHomogeneousPointsOnSurface(const size_t N) const {
    102102  std::vector<Vector> PointsOnSurface = arg->getHomogeneousPointsOnSurface(N);
    103103  for(std::vector<Vector>::iterator iter = PointsOnSurface.begin(); iter != PointsOnSurface.end(); ++iter) {
    … …  
    126126}
    127127
    128 std::vector<Vector> Transform_impl::getHomogeneousPointsOnSurface(const int N) const {
     128std::vector<Vector> Transform_impl::getHomogeneousPointsOnSurface(const size_t N) const {
    129129  std::vector<Vector> PointsOnSurface = arg->getHomogeneousPointsOnSurface(N);
    130130  for(std::vector<Vector>::iterator iter = PointsOnSurface.begin(); iter != PointsOnSurface.end(); ++iter) {

  • src/Shapes/ShapeOps_impl.hpp

    rd17f3d r9c1c89  
    1919  virtual ~Resize_impl();
    2020  virtual bool isInside(const Vector& point);
    21   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const int N) const;
     21  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
    2222private:
    2323  Shape::impl_ptr arg;
    … …  
    3131  virtual ~Translate_impl();
    3232  virtual bool isInside(const Vector& point);
    33   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const int N) const;
     33  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
    3434private:
    3535  Shape::impl_ptr arg;
    … …  
    4343  virtual ~Stretch_impl();
    4444  virtual bool isInside(const Vector& point);
    45   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const int N) const;
     45  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
    4646private:
    4747  Shape::impl_ptr arg;
    … …  
    5656  virtual ~Transform_impl();
    5757  virtual bool isInside(const Vector& point);
    58   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const int N) const;
     58  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
    5959private:
    6060  Shape::impl_ptr arg;

  • src/Shapes/Shape_impl.hpp

    rd17f3d r9c1c89  
    2020  virtual ~Shape_impl(){};
    2121  virtual bool isInside(const Vector &point)=0;
    22   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const int N) const=0;
     22  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const=0;
    2323};
    2424
    … …  
    2828    return true;
    2929  }
    30   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const int N) const {
     30  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const {
    3131    std::vector<Vector> PointsOnSurface;
    3232    return PointsOnSurface;
    … …  
    3838    return false;
    3939  }
    40   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const int N) const {
     40  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const {
    4141    std::vector<Vector> PointsOnSurface;
    4242    return PointsOnSurface;
    … …  
    4949  virtual ~AndShape_impl();
    5050  virtual bool isInside(const Vector &point);
    51   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const int N) const;
     51  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
    5252private:
    5353  Shape::impl_ptr lhs;
    … …  
    6060  virtual ~OrShape_impl();
    6161  virtual bool isInside(const Vector &point);
    62   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const int N) const;
     62  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
    6363private:
    6464  Shape::impl_ptr lhs;
    … …  
    7171  virtual ~NotShape_impl();
    7272  virtual bool isInside(const Vector &point);
    73   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const int N) const;
     73  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
    7474private:
    7575  Shape::impl_ptr arg;
Note: See TracChangeset for help on using the changeset viewer.