Changeset 042f82 for src/parser.hpp


Ignore:
Timestamp:
Jul 23, 2009, 2:21:57 PM (16 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:
36ec71
Parents:
205ccd
Message:

fixed indentation from tabs to two spaces.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/parser.hpp

    r205ccd r042f82  
    4040
    4141class MatrixContainer {
    42         public:
    43                 double ***Matrix;
    44                 int **Indices;
    45                 char *Header;
    46                 int MatrixCounter;
    47                 int *RowCounter;
    48                 int ColumnCounter;
     42  public:
     43    double ***Matrix;
     44    int **Indices;
     45    char *Header;
     46    int MatrixCounter;
     47    int *RowCounter;
     48    int ColumnCounter;
    4949
    50         MatrixContainer();
    51         virtual ~MatrixContainer();
     50  MatrixContainer();
     51  virtual ~MatrixContainer();
    5252
    53         bool ParseMatrix(const char *name, int skiplines, int skipcolumns, int MatrixNr);
    54         virtual bool ParseFragmentMatrix(const char *name, const char *prefix, string suffix, int skiplines, int skipcolumns);
    55         bool AllocateMatrix(const char *GivenHeader, int MCounter, int *RCounter, int CCounter);
    56         bool ResetMatrix();
    57         double FindMinValue();
    58         double FindMaxValue();
    59         bool SetLastMatrix(double value, int skipcolumns);
    60         bool SetLastMatrix(double **values, int skipcolumns);
    61         //bool ParseIndices();
    62         //bool SumSubValues();
    63         bool SumSubManyBodyTerms(class MatrixContainer &Matrix, class KeySetsContainer &KeySet, int Order);
    64         bool WriteTotalFragments(const char *name, const char *prefix);
    65         bool WriteLastMatrix(const char *name, const char *prefix, const char *suffix);
     53  bool ParseMatrix(const char *name, int skiplines, int skipcolumns, int MatrixNr);
     54  virtual bool ParseFragmentMatrix(const char *name, const char *prefix, string suffix, int skiplines, int skipcolumns);
     55  bool AllocateMatrix(const char *GivenHeader, int MCounter, int *RCounter, int CCounter);
     56  bool ResetMatrix();
     57  double FindMinValue();
     58  double FindMaxValue();
     59  bool SetLastMatrix(double value, int skipcolumns);
     60  bool SetLastMatrix(double **values, int skipcolumns);
     61  //bool ParseIndices();
     62  //bool SumSubValues();
     63  bool SumSubManyBodyTerms(class MatrixContainer &Matrix, class KeySetsContainer &KeySet, int Order);
     64  bool WriteTotalFragments(const char *name, const char *prefix);
     65  bool WriteLastMatrix(const char *name, const char *prefix, const char *suffix);
    6666};
    6767
     
    6969
    7070class EnergyMatrix : public MatrixContainer {
    71         public:
    72                 bool ParseIndices();
    73                 bool SumSubEnergy(class EnergyMatrix &Fragments, class EnergyMatrix *CorrectionFragments, class KeySetsContainer &KeySet, int Order, double sign);
    74                 bool ParseFragmentMatrix(const char *name, const char *prefix, string suffix, int skiplines, int skipcolumns);
     71  public:
     72    bool ParseIndices();
     73    bool SumSubEnergy(class EnergyMatrix &Fragments, class EnergyMatrix *CorrectionFragments, class KeySetsContainer &KeySet, int Order, double sign);
     74    bool ParseFragmentMatrix(const char *name, const char *prefix, string suffix, int skiplines, int skipcolumns);
    7575};
    7676
     
    7878
    7979class ForceMatrix : public MatrixContainer {
    80         public:
    81                 bool ParseIndices(const char *name);
    82                 bool SumSubForces(class ForceMatrix &Fragments, class KeySetsContainer &KeySet, int Order, double sign);
    83                 bool ParseFragmentMatrix(const char *name, const char *prefix, string suffix, int skiplines, int skipcolumns);
     80  public:
     81    bool ParseIndices(const char *name);
     82    bool SumSubForces(class ForceMatrix &Fragments, class KeySetsContainer &KeySet, int Order, double sign);
     83    bool ParseFragmentMatrix(const char *name, const char *prefix, string suffix, int skiplines, int skipcolumns);
    8484};
    8585
     
    8787
    8888class KeySetsContainer {
    89         public:
    90                 int **KeySets;
    91                 int *AtomCounter;
    92                 int FragmentCounter;
    93                 int Order;
    94                 int *FragmentsPerOrder;
    95                 int **OrderSet;
     89  public:
     90    int **KeySets;
     91    int *AtomCounter;
     92    int FragmentCounter;
     93    int Order;
     94    int *FragmentsPerOrder;
     95    int **OrderSet;
    9696
    97         KeySetsContainer();
    98         ~KeySetsContainer();
     97  KeySetsContainer();
     98  ~KeySetsContainer();
    9999
    100         bool ParseKeySets(const char *name, const int *ACounter, const int FCounter);
    101         bool ParseManyBodyTerms();
    102         bool Contains(const int GreaterSet, const int SmallerSet);
     100  bool ParseKeySets(const char *name, const int *ACounter, const int FCounter);
     101  bool ParseManyBodyTerms();
     102  bool Contains(const int GreaterSet, const int SmallerSet);
    103103};
    104104
Note: See TracChangeset for help on using the changeset viewer.