Changes in / [0bcd11:48c338]


Ignore:
Files:
3 added
37 edited

Legend:

Unmodified
Added
Removed

  • src/Actions/AnalysisAction/MolecularVolumeAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/AnalysisAction/MolecularVolumeAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "boundary.hpp"
    1110#include "config.hpp"

  • src/Actions/AnalysisAction/PairCorrelationAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/AnalysisAction/PairCorrelationAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "analysis_correlation.hpp"
    1110#include "boundary.hpp"

  • src/Actions/AnalysisAction/PrincipalAxisSystemAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/AnalysisAction/PrincipalAxisSystemAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "molecule.hpp"
    1110#include "log.hpp"

  • src/Actions/AtomAction/AddAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/AtomAction/AddAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "atom.hpp"
    1110#include "element.hpp"

  • src/Actions/AtomAction/ChangeElementAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/AtomAction/ChangeElementAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "atom.hpp"
    1110#include "log.hpp"

  • src/Actions/AtomAction/RemoveAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/AtomAction/RemoveAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "atom.hpp"
    1110#include "Descriptors/AtomDescriptor.hpp"

  • src/Actions/CmdAction/BondLengthTableAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/CmdAction/BondLengthTableAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "config.hpp"
    1110#include "log.hpp"
    … …  
    4039
    4140  if(dialog->display()) {
     41    DoLog(0) && (Log() << Verbose(0) << "Using " << BondGraphFileName << " as bond length table." << endl);
    4242    delete dialog;
    4343  } else {
    4444    delete dialog;
     45    return Action::failure;
    4546  }
    4647

  • src/Actions/CmdAction/ElementDbAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/CmdAction/ElementDbAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "config.hpp"
    1110#include "log.hpp"
    … …  
    4140  config *configuration = World::getInstance().getConfig();
    4241  dialog->queryString(NAME, &databasepath, MapOfActions::getInstance().getDescription(NAME));
    43   strcpy(configuration->databasepath, databasepath.c_str());
    4442
    4543  if(dialog->display()) {
     44    strcpy(configuration->databasepath, databasepath.c_str());
    4645    delete dialog;
    4746  } else {
    4847    delete dialog;
     48    return Action::failure;
    4949  }
    5050

  • src/Actions/CmdAction/FastParsingAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/CmdAction/FastParsingAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "config.hpp"
    1110#include "log.hpp"

  • src/Actions/CmdAction/VerboseAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/CmdAction/VerboseAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "log.hpp"
    1110#include "verbose.hpp"

  • src/Actions/CmdAction/VersionAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/CmdAction/VersionAction.hpp"
    9 #include "CommandLineParser.hpp"
    109
    1110#include <iostream>

  • src/Actions/FragmentationAction/DepthFirstSearchAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/FragmentationAction/DepthFirstSearchAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "atom.hpp"
    1110#include "config.hpp"

  • src/Actions/FragmentationAction/FragmentationAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/FragmentationAction/FragmentationAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "atom.hpp"
    1110#include "config.hpp"

  • src/Actions/FragmentationAction/SubgraphDissectionAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/FragmentationAction/SubgraphDissectionAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "atom.hpp"
    1110#include "config.hpp"

  • src/Actions/MapOfActions.cpp

    r0bcd11 r48c338  
    5050  v = boost::any(BoxValue(BV));
    5151}
    52 
    5352
    5453/** Constructor of class MapOfActions.
    … …  
    8584  DescriptionMap["nonconvex-envelope"] = "create the non-convex envelope for a molecule";
    8685  DescriptionMap["molecular-volume"] = "calculate the volume of a given molecule";
    87   DescriptionMap["pair-correlation"] = "pair correlation analysis between two elements";
    88   DescriptionMap["pair-correlation-point"] = "pair correlation analysis between atoms of a element to a given point";
    89   DescriptionMap["pair-correlation-surface"] = "pair correlation analysis between atoms of a given element and a surface";
     86  DescriptionMap["pair-correlation"] = "pair correlation analysis between two elements, element and point or element and surface";
    9087  DescriptionMap["parse-xyz"] = "parse xyz file into World";
    9188  DescriptionMap["principal-axis-system"] = "calculate the principal axis system of the specified molecule";
    … …  
    113110  DescriptionMap["distances"] = "list of three of distances in space, one for each axis direction";
    114111  DescriptionMap["DoRotate"] = "whether to rotate or just report angles";
    115   DescriptionMap["element"] = "set of elements";
     112  DescriptionMap["element"] = "single element";
     113  DescriptionMap["elements"] = "set of elements";
    116114  DescriptionMap["end-mol"] = "last or end step";
    117115  DescriptionMap["input"] = "name of input file";
    … …  
    120118  DescriptionMap["MaxDistance"] = "maximum distance in space";
    121119  DescriptionMap["molecule-by-id"] = "index of a molecule";
     120  DescriptionMap["molecule-by-name"] = "name of a molecule";
    122121  DescriptionMap["order"] = "order of a discretization, dissection, ...";
    123122  DescriptionMap["output-file"] = "name of the output file";
    … …  
    146145  ShortFormMap["linear-interpolate"] = "L";
    147146  ShortFormMap["nonconvex-envelope"] = "N";
    148   ShortFormMap["pair-correlation"] = "CE";
    149   ShortFormMap["pair-correlation-point"] = "CP";
    150   ShortFormMap["pair-correlation-surface"] = "CS";
     147  ShortFormMap["pair-correlation"] = "C";
    151148  ShortFormMap["parse-xyz"] = "p";
    152149  ShortFormMap["remove-atom"] = "r";
    … …  
    188185  TypeMap["nonconvex-envelope"] = Molecule;
    189186  TypeMap["parse-xyz"] = String;
    190   TypeMap["principal-axis-system"] = Axis;
     187  TypeMap["pair-correlation"] = String;
     188  TypeMap["principal-axis-system"] = Molecule;
    191189  TypeMap["remove-atom"] = Atom;
    192190  TypeMap["remove-sphere"] = Atom;
    … …  
    208206  TypeMap["bin-end"] = Double;
    209207  TypeMap["bin-start"] = Double;
     208  TypeMap["bin-width"] = Double;
    210209  TypeMap["distance"] = Double;
    211210  TypeMap["distances"] = Vector;
    … …  
    217216  TypeMap["MaxDistance"] = Double;
    218217  TypeMap["molecule-by-id"] = Molecule;
     218  TypeMap["molecule-by-name"] = Molecule;
    219219  TypeMap["order"] = Integer;
    220220  TypeMap["output-file"] = String;
    … …  
    224224  // default values for any action that needs one (always string!)
    225225  DefaultValue["molecule-by-id"] = "-1";
     226  DefaultValue["bin-width"] = "0.5";
     227  DefaultValue["periodic"] = "0";
    226228
    227229
    … …  
    229231//      generic.insert("add-atom");
    230232//  generic.insert("bond-file");
    231 //      generic.insert("bond-table");
     233        generic.insert("bond-table");
    232234  generic.insert("boundary");
    233235//  generic.insert("bound-in-box");
    … …  
    240242//      generic.insert("default-molname");
    241243        generic.insert("depth-first-search");
    242 //      generic.insert("element-db");
     244        generic.insert("element-db");
    243245//      generic.insert("fastparsing");
    244246  generic.insert("fill-molecule");
    … …  
    248250//  generic.insert("molecular-volume");
    249251//  generic.insert("nonconvex-envelope");
    250 //      generic.insert("pair-correlation");
    251 //      generic.insert("pair-correlation-point");
    252 //      generic.insert("pair-correlation-surface");
     252        generic.insert("pair-correlation");
    253253//      generic.insert("parse-xyz");
    254254//  generic.insert("principal-axis-system");
    … …  
    256256//  generic.insert("remove-sphere");
    257257  generic.insert("repeat-box");
    258 //  generic.insert("rotate-to-pas");
     258  generic.insert("rotate-to-pas");
    259259//      generic.insert("save-adjacency");
    260260//  generic.insert("save-bonds");
    … …  
    269269        generic.insert("version");
    270270//      // list of generic values
    271 //      generic.insert("bin-output-file");
    272 //  generic.insert("bin-end");
    273 //  generic.insert("bin-start");
    274271//  generic.insert("distance");
    275272//  generic.insert("distances");
    … …  
    278275    generic.insert("input");
    279276//  generic.insert("length");
    280 //  generic.insert("output-file");
    281 //  generic.insert("periodic");
    282 //  generic.insert("position");
    283277//  generic.insert("start-mol");
    284278
    … …  
    287281
    288282    // hidden arguments
     283  generic.insert("bin-end");
     284  generic.insert("bin-output-file");
     285  generic.insert("bin-start");
     286  generic.insert("bin-width");
    289287  generic.insert("distance");
    290288  generic.insert("DoRotate");
    291289  generic.insert("distances");
     290  generic.insert("element");
     291  generic.insert("elements");
    292292  generic.insert("lengths");
    293293  generic.insert("MaxDistance");
    294294  generic.insert("molecule-by-id");
     295  generic.insert("molecule-by-name");
    295296  generic.insert("order");
     297  generic.insert("output-file");
     298  generic.insert("periodic");
     299  generic.insert("position");
    296300}
    297301
    … …  
    541545}
    542546
     547/** Returns the inverse to MapOfActions::ShortFormMap, i.e. lookup actionname for its short form.
     548 * \return map from short form of action to name of action
     549 */
     550map <std::string, std::string> MapOfActions::getShortFormToActionMap()
     551{
     552  map <std::string, std::string> result;
     553
     554  for (map<std::string, std::string>::iterator iter = ShortFormMap.begin(); iter != ShortFormMap.end();  ++iter)
     555    result[iter->second] = iter->first;
     556
     557  return result;
     558}
    543559
    544560

  • src/Actions/MapOfActions.hpp

    r0bcd11 r48c338  
    3030  std::string getKeyAndShortForm(string actionname);
    3131  std::string getShortForm(string actionname);
     32  map <std::string, std::string> getShortFormToActionMap();
    3233
    3334  void AddOptionsToParser();

  • src/Actions/WorldAction/AddEmptyBoundaryAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/WorldAction/AddEmptyBoundaryAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "atom.hpp"
    1110#include "log.hpp"

  • src/Actions/WorldAction/BoundInBoxAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/WorldAction/BoundInBoxAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "log.hpp"
    1110#include "molecule.hpp"

  • src/Actions/WorldAction/CenterInBoxAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/WorldAction/CenterInBoxAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "log.hpp"
    1110#include "molecule.hpp"

  • src/Actions/WorldAction/CenterOnEdgeAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/WorldAction/CenterOnEdgeAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "atom.hpp"
    1110#include "log.hpp"

  • src/Actions/WorldAction/ChangeBoxAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/WorldAction/ChangeBoxAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "log.hpp"
    1110#include "verbose.hpp"

  • src/Actions/WorldAction/RemoveSphereOfAtomsAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/WorldAction/RemoveSphereOfAtomsAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "atom.hpp"
    1110#include "Descriptors/AtomDescriptor.hpp"

  • src/Actions/WorldAction/RepeatBoxAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/WorldAction/RepeatBoxAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "atom.hpp"
    1110#include "log.hpp"

  • src/Actions/WorldAction/ScaleBoxAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/WorldAction/ScaleBoxAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "atom.hpp"
    1110#include "log.hpp"

  • src/Actions/WorldAction/SetDefaultNameAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/WorldAction/SetDefaultNameAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "log.hpp"
    1110#include "World.hpp"

  • src/Actions/WorldAction/SetGaussianBasisAction.cpp

    r0bcd11 r48c338  
    77
    88#include "Actions/WorldAction/SetGaussianBasisAction.hpp"
    9 #include "CommandLineParser.hpp"
    109#include "config.hpp"
    1110#include "World.hpp"

  • src/CommandLineParser.cpp

    r0bcd11 r48c338  
    99#include <fstream>
    1010#include <iostream>
     11#include <map>
    1112
    1213#include "Patterns/Singleton_impl.hpp"
    1314#include "CommandLineParser.hpp"
     15#include "log.hpp"
     16#include "verbose.hpp"
    1417
    1518using namespace std;
    … …  
    4548}
    4649
     50/** Scan the argument list for -a or --arguments and store their order for later use.
     51 * \param &ShortFormToActionMap e.g. gives "help" for "h"
     52 */
     53void CommandLineParser::scanforSequenceOfArguments(map <std::string, std::string> &ShortFormToActionMap)
     54{
     55  // go through all arguments
     56  for (int i=1;i<argc;i++) {
     57    (cout << Verbose(1) << "Checking on " << argv[i] << endl);
     58    // check whether they begin with - or -- and check that next letter is not numeric, if so insert
     59    if (argv[i][0] == '-') {
     60      (cout << Verbose(1) << "Possible argument: " << argv[i] << endl);
     61      if (argv[i][1] == '-') {
     62        (cout << Verbose(1) << "Putting " << argv[i] << " into the sequence." << endl);
     63        SequenceOfActions.push_back(&(argv[i][2]));
     64      } else if (((argv[i][1] < '0') || (argv[i][1] > '9')) && ((argv[i][1] != '.'))) {
     65        map <std::string, std::string>::iterator iter = ShortFormToActionMap.find(&(argv[i][1]));
     66        if (iter != ShortFormToActionMap.end()) {
     67          (cout << Verbose(1) << "Putting " << iter->second << " for " << iter->first << " into the sequence." << endl);
     68          SequenceOfActions.push_back(iter->second);
     69        }
     70      }
     71    }
     72  }
     73}
    4774
    4875
    … …  
    7299 * \param **_argv argument array from main()
    73100 */
    74 void CommandLineParser::Run(int _argc, char **_argv)
     101void CommandLineParser::Run(int _argc, char **_argv, map <std::string, std::string> &ShortFormToActionMap)
    75102{
    76103  setOptions(_argc,_argv);
    77104  Parse();
     105  scanforSequenceOfArguments(ShortFormToActionMap);
    78106}
    79107

  • src/CommandLineParser.hpp

    r0bcd11 r48c338  
    1515#include "Patterns/Singleton.hpp"
    1616
     17#include <list>
    1718
    1819class CommandLineParser : public Singleton<CommandLineParser> {
    … …  
    2122
    2223  // Parses the command line arguments in CommandLineParser::**argv with currently known options.
    23   void Run(int _argc, char **_argv);
     24  void Run(int _argc, char **_argv, std::map <std::string, std::string> &ShortFormToActionMap);
    2425
    2526  // Checks whether there have been any commands on the command line.
    … …  
    4041  po::variables_map vm;
    4142
     43  // private sequence of actions as they appeared on the command line
     44  std::list<std::string> SequenceOfActions;
     45
    4246private:
    4347  // private constructor and destructor
    … …  
    5761  void Parse();
    5862
     63  // as boost's program_options does not care about of order of appearance but we do for actions,
     64  // we have to have a list and a function to obtain it.
     65  void scanforSequenceOfArguments(std::map <std::string, std::string> &ShortFormToActionMap);
     66
    5967  // argument counter and array passed on from main()
    6068  int argc;

  • src/Makefile.am

    r0bcd11 r48c338  
    114114  Descriptors/MoleculeDescriptor.cpp \
    115115  Descriptors/MoleculeIdDescriptor.cpp \
     116  Descriptors/MoleculeNameDescriptor.cpp \
    116117  Descriptors/MoleculePtrDescriptor.cpp
    117118                                   
    … …  
    122123  Descriptors/MoleculeDescriptor.hpp \
    123124  Descriptors/MoleculeIdDescriptor.hpp \
     125  Descriptors/MoleculeNameDescriptor.hpp \
    124126  Descriptors/MoleculePtrDescriptor.hpp
    125127                                   

  • src/UIElements/CommandLineUI/CommandLineWindow.cpp

    r0bcd11 r48c338  
    7979void CommandLineWindow::display() {
    8080  // go through all possible actions
    81   for (po::variables_map::iterator CommandRunner = CommandLineParser::getInstance().vm.begin(); CommandRunner != CommandLineParser::getInstance().vm.end(); ++CommandRunner) {
    82     cout << "Checking presence of " << CommandRunner->first << endl;
    83     if (ActionRegistry::getInstance().isActionByNamePresent(CommandRunner->first))
    84       ActionRegistry::getInstance().getActionByName(CommandRunner->first)->call();
     81  for (std::list<std::string>::iterator CommandRunner = CommandLineParser::getInstance().SequenceOfActions.begin(); CommandRunner != CommandLineParser::getInstance().SequenceOfActions.end(); ++CommandRunner) {
     82    cout << "Checking presence of " << *CommandRunner << endl;
     83    if (ActionRegistry::getInstance().isActionByNamePresent(*CommandRunner))
     84      ActionRegistry::getInstance().getActionByName(*CommandRunner)->call();
    8585  }
    8686}

  • src/analysis_correlation.cpp

    r0bcd11 r48c338  
    179179  }
    180180
    181 //  outmap = new PairCorrelationMap;
    182 //  for (MoleculeList::const_iterator MolWalker = molecules->ListOfMolecules.begin(); MolWalker != molecules->ListOfMolecules.end(); MolWalker++)
    183 //    if ((*MolWalker)->ActiveFlag) {
    184 //      double * FullMatrix = ReturnFullMatrixforSymmetric(World::getInstance().getDomain());
    185 //      double * FullInverseMatrix = InverseMatrix(FullMatrix);
    186 //      DoeLog(2) && (eLog()<< Verbose(2) << "Current molecule is " << *MolWalker << "." << endl);
    187 //      for (molecule::const_iterator iter = (*MolWalker)->begin(); iter != (*MolWalker)->end(); ++iter) {
    188 //        DoLog(3) && (Log() << Verbose(3) << "Current atom is " << **iter << "." << endl);
    189 //        if ((type1 == NULL) || ((*iter)->type == type1)) {
    190 //          periodicX = *(*iter)->node;
    191 //          periodicX.MatrixMultiplication(FullInverseMatrix);  // x now in [0,1)^3
    192 //          // go through every range in xyz and get distance
    193 //          for (n[0]=-ranges[0]; n[0] <= ranges[0]; n[0]++)
    194 //            for (n[1]=-ranges[1]; n[1] <= ranges[1]; n[1]++)
    195 //              for (n[2]=-ranges[2]; n[2] <= ranges[2]; n[2]++) {
    196 //                checkX = Vector(n[0], n[1], n[2]) + periodicX;
    197 //                checkX.MatrixMultiplication(FullMatrix);
    198 //                for (MoleculeList::const_iterator MolOtherWalker = MolWalker; MolOtherWalker != molecules->ListOfMolecules.end(); MolOtherWalker++)
    199 //                  if ((*MolOtherWalker)->ActiveFlag) {
    200 //                    DoLog(2) && (Log() << Verbose(2) << "Current other molecule is " << *MolOtherWalker << "." << endl);
    201 //                    for (molecule::const_iterator runner = (*MolOtherWalker)->begin(); runner != (*MolOtherWalker)->end(); ++runner) {
    202 //                      DoLog(3) && (Log() << Verbose(3) << "Current otheratom is " << **runner << "." << endl);
    203 //                      if ((*iter)->nr < (*runner)->nr)
    204 //                        if ((type2 == NULL) || ((*runner)->type == type2)) {
    205 //                          periodicOtherX = *(*runner)->node;
    206 //                          periodicOtherX.MatrixMultiplication(FullInverseMatrix);  // x now in [0,1)^3
    207 //                          // go through every range in xyz and get distance
    208 //                          for (Othern[0]=-ranges[0]; Othern[0] <= ranges[0]; Othern[0]++)
    209 //                            for (Othern[1]=-ranges[1]; Othern[1] <= ranges[1]; Othern[1]++)
    210 //                              for (Othern[2]=-ranges[2]; Othern[2] <= ranges[2]; Othern[2]++) {
    211 //                                checkOtherX = Vector(Othern[0], Othern[1], Othern[2]) + periodicOtherX;
    212 //                                checkOtherX.MatrixMultiplication(FullMatrix);
    213 //                                distance = checkX.distance(checkOtherX);
    214 //                                //Log() << Verbose(1) <<"Inserting " << *(*iter) << " and " << *(*runner) << endl;
    215 //                                outmap->insert ( pair<double, pair <atom *, atom*> > (distance, pair<atom *, atom*> ((*iter), (*runner)) ) );
    216 //                              }
    217 //                        }
    218 //                  }
    219 //              }
    220 //            }
    221 //        }
    222 //      }
    223 //      delete[](FullMatrix);
    224 //      delete[](FullInverseMatrix);
    225 //    }
    226 
    227181  return outmap;
    228182};
    … …  
    239193  CorrelationToPointMap *outmap = NULL;
    240194  double distance = 0.;
     195  double *cell_size = World::getInstance().getDomain();
    241196
    242197  if (molecules->ListOfMolecules.empty()) {
    … …  
    254209        for (vector<element *>::const_iterator type = elements.begin(); type != elements.end(); ++type)
    255210          if ((*type == NULL) || ((*iter)->type == *type)) {
    256             distance = (*iter)->node->PeriodicDistance(*point, World::getInstance().getDomain());
     211            distance = (*iter)->node->PeriodicDistance(*point, cell_size);
    257212            DoLog(4) && (Log() << Verbose(4) << "Current distance is " << distance << "." << endl);
    258213            outmap->insert ( pair<double, pair<atom *, const Vector*> >(distance, pair<atom *, const Vector*> ((*iter), point) ) );

  • src/builder.cpp

    r0bcd11 r48c338  
    15551555              performCriticalExit();
    15561556            } else {
    1557               DoLog(0) && (Log() << Verbose(0) << "Using " << argv[argptr] << " as elements database." << endl);
    1558               strncpy (configuration.databasepath, argv[argptr], MAXSTRINGSIZE-1);
    1559               DatabasePathGiven = true;
     1557              ArgcList.insert(argptr-1);
     1558              ArgcList.insert(argptr);
    15601559              argptr+=1;
    15611560            }
    … …  
    15661565              performCriticalExit();
    15671566            } else {
    1568               BondGraphFileName = argv[argptr];
    1569               DoLog(0) && (Log() << Verbose(0) << "Using " << BondGraphFileName << " as bond length table." << endl);
     1567              ArgcList.insert(argptr-1);
     1568              ArgcList.insert(argptr);
    15701569              argptr+=1;
    15711570            }
    … …  
    16011600
    16021601    // 3a. Parse the element database
    1603     if (DatabasePathGiven)
    1604       if (periode->LoadPeriodentafel(configuration.databasepath)) {
    1605         DoLog(0) && (Log() << Verbose(0) << "Element list loaded successfully." << endl);
    1606         //periode->Output();
    1607       } else {
    1608         DoLog(0) && (Log() << Verbose(0) << "Element list loading failed." << endl);
    1609         return 1;
    1610       }
     1602//    if (DatabasePathGiven)
     1603//      if (periode->LoadPeriodentafel(configuration.databasepath)) {
     1604//        DoLog(0) && (Log() << Verbose(0) << "Element list loaded successfully." << endl);
     1605//        //periode->Output();
     1606//      } else {
     1607//        DoLog(0) && (Log() << Verbose(0) << "Element list loading failed." << endl);
     1608//        return 1;
     1609//      }
    16111610    // 3b. Find config file name and parse if possible, also BondGraphFileName
    16121611    if (argv[1][0] != '-') {
    … …  
    17631762                  switch(argv[argptr][0]) {
    17641763                    case 'E':
    1765                       {
    1766                         if ((argptr+6 >= argc) || (!IsValidNumber(argv[argptr+1])) || (!IsValidNumber(argv[argptr+5])) || (!IsValidNumber(argv[argptr+6])) || (!IsValidNumber(argv[argptr+2])) || (argv[argptr+1][0] == '-') || (argv[argptr+2][0] == '-') || (argv[argptr+3][0] == '-') || (argv[argptr+4][0] == '-')) {
    1767                           ExitFlag = 255;
    1768                           DoeLog(0) && (eLog()<< Verbose(0) << "Not enough or invalid arguments given for pair correlation analysis: -C E <Z1> <Z2> <output> <bin output> <binstart> <binend>" << endl);
    1769                           performCriticalExit();
    1770                         } else {
    1771                           ofstream output(argv[argptr+3]);
    1772                           ofstream binoutput(argv[argptr+4]);
    1773                           const double BinStart = atof(argv[argptr+5]);
    1774                           const double BinEnd = atof(argv[argptr+6]);
    1775 
    1776                           std::vector<element *> elements;
    1777                           elements.push_back(periode->FindElement((const int) atoi(argv[argptr+1])));
    1778                           elements.push_back(periode->FindElement((const int) atoi(argv[argptr+2])));
    1779                           PairCorrelationMap *correlationmap = NULL;
    1780                           if (periodic)
    1781                             correlationmap = PeriodicPairCorrelation(molecules, elements, ranges);
    1782                           else
    1783                             correlationmap = PairCorrelation(molecules, elements);
    1784                           OutputPairCorrelation(&output, correlationmap);
    1785                           BinPairMap *binmap = BinData( correlationmap, 0.5, BinStart, BinEnd );
    1786                           OutputCorrelation ( &binoutput, binmap );
    1787                           output.close();
    1788                           binoutput.close();
    1789                           delete(binmap);
    1790                           delete(correlationmap);
    1791                           argptr+=7;
    1792                         }
    1793                       }
     1764                      ArgcList.insert(argptr-1);
     1765                      ArgcList.insert(argptr);
     1766                      ArgcList.insert(argptr+1);
     1767                      ArgcList.insert(argptr+2);
     1768                      ArgcList.insert(argptr+3);
     1769                      ArgcList.insert(argptr+4);
     1770                      ArgcList.insert(argptr+5);
     1771                      ArgcList.insert(argptr+6);
     1772                      ArgcList.insert(argptr+7);
     1773                      ArgcList.insert(argptr+8);
     1774                      ArgcList.insert(argptr+9);
     1775                      ArgcList.insert(argptr+10);
     1776                      ArgcList.insert(argptr+11);
     1777                      argptr+=12;
    17941778                      break;
    17951779
    17961780                    case 'P':
    1797                       {
    1798                         if ((argptr+8 >= argc) || (!IsValidNumber(argv[argptr+1])) ||  (!IsValidNumber(argv[argptr+2])) || (!IsValidNumber(argv[argptr+3])) || (!IsValidNumber(argv[argptr+4])) || (!IsValidNumber(argv[argptr+7])) || (!IsValidNumber(argv[argptr+8])) || (argv[argptr+1][0] == '-') || (argv[argptr+2][0] == '-') || (argv[argptr+3][0] == '-') || (argv[argptr+4][0] == '-') || (argv[argptr+5][0] == '-') || (argv[argptr+6][0] == '-')) {
    1799                           ExitFlag = 255;
    1800                           DoeLog(0) && (eLog()<< Verbose(0) << "Not enough or invalid arguments given for pair correlation analysis: -C P <Z1> <x> <y> <z> <output> <bin output> <binstart> <binend>" << endl);
    1801                           performCriticalExit();
    1802                         } else {
    1803                           ofstream output(argv[argptr+5]);
    1804                           ofstream binoutput(argv[argptr+6]);
    1805                           const double BinStart = atof(argv[argptr+7]);
    1806                           const double BinEnd = atof(argv[argptr+8]);
    1807 
    1808                           std::vector<element *> elements;
    1809                           elements.push_back(periode->FindElement((const int) atoi(argv[argptr+1])));
    1810                           Vector *Point = new Vector((const double) atof(argv[argptr+1]),(const double) atof(argv[argptr+2]),(const double) atof(argv[argptr+3]));
    1811                           CorrelationToPointMap *correlationmap = NULL;
    1812                           if (periodic)
    1813                             correlationmap  = PeriodicCorrelationToPoint(molecules, elements, Point, ranges);
    1814                           else
    1815                             correlationmap = CorrelationToPoint(molecules, elements, Point);
    1816                           OutputCorrelationToPoint(&output, correlationmap);
    1817                           BinPairMap *binmap = BinData( correlationmap, 0.5, BinStart, BinEnd );
    1818                           OutputCorrelation ( &binoutput, binmap );
    1819                           output.close();
    1820                           binoutput.close();
    1821                           delete(Point);
    1822                           delete(binmap);
    1823                           delete(correlationmap);
    1824                           argptr+=9;
    1825                         }
    1826                       }
     1781                      ArgcList.insert(argptr-1);
     1782                      ArgcList.insert(argptr);
     1783                      ArgcList.insert(argptr+1);
     1784                      ArgcList.insert(argptr+2);
     1785                      ArgcList.insert(argptr+3);
     1786                      ArgcList.insert(argptr+4);
     1787                      ArgcList.insert(argptr+5);
     1788                      ArgcList.insert(argptr+6);
     1789                      ArgcList.insert(argptr+7);
     1790                      ArgcList.insert(argptr+8);
     1791                      ArgcList.insert(argptr+9);
     1792                      ArgcList.insert(argptr+10);
     1793                      ArgcList.insert(argptr+11);
     1794                      ArgcList.insert(argptr+12);
     1795                      ArgcList.insert(argptr+13);
     1796                      ArgcList.insert(argptr+14);
     1797                      argptr+=15;
    18271798                      break;
    18281799
    18291800                    case 'S':
    1830                       {
    1831                         if ((argptr+6 >= argc) || (!IsValidNumber(argv[argptr+1])) || (!IsValidNumber(argv[argptr+4])) || (!IsValidNumber(argv[argptr+5])) || (!IsValidNumber(argv[argptr+6])) || (argv[argptr+1][0] == '-') || (argv[argptr+2][0] == '-') || (argv[argptr+3][0] == '-')) {
    1832                           ExitFlag = 255;
    1833                           DoeLog(0) && (eLog()<< Verbose(0) << "Not enough or invalid arguments given for pair correlation analysis: -C S <Z> <output> <bin output> <BinWidth> <BinStart> <BinEnd>" << endl);
    1834                           performCriticalExit();
    1835                         } else {
    1836                           ofstream output(argv[argptr+2]);
    1837                           ofstream binoutput(argv[argptr+3]);
    1838                           const double radius = 4.;
    1839                           const double BinWidth = atof(argv[argptr+4]);
    1840                           const double BinStart = atof(argv[argptr+5]);
    1841                           const double BinEnd = atof(argv[argptr+6]);
    1842                           double LCWidth = 20.;
    1843                           if (BinEnd > 0) {
    1844                             if (BinEnd > 2.*radius)
    1845                                 LCWidth = BinEnd;
    1846                             else
    1847                               LCWidth = 2.*radius;
    1848                           }
    1849 
    1850                           // get the boundary
    1851                           class molecule *Boundary = NULL;
    1852                           class Tesselation *TesselStruct = NULL;
    1853                           const LinkedCell *LCList = NULL;
    1854                           // find biggest molecule
    1855                           int counter  = 0;
    1856                           for (MoleculeList::iterator BigFinder = molecules->ListOfMolecules.begin(); BigFinder != molecules->ListOfMolecules.end(); BigFinder++) {
    1857                             if ((Boundary == NULL) || (Boundary->getAtomCount() < (*BigFinder)->getAtomCount())) {
    1858                               Boundary = *BigFinder;
    1859                             }
    1860                             counter++;
    1861                           }
    1862                           bool *Actives = new bool[counter];
    1863                           counter = 0;
    1864                           for (MoleculeList::iterator BigFinder = molecules->ListOfMolecules.begin(); BigFinder != molecules->ListOfMolecules.end(); BigFinder++) {
    1865                             Actives[counter++] = (*BigFinder)->ActiveFlag;
    1866                             (*BigFinder)->ActiveFlag = (*BigFinder == Boundary) ? false : true;
    1867                           }
    1868                           LCList = new LinkedCell(Boundary, LCWidth);
    1869                           std::vector<element *> elements;
    1870                           elements.push_back(periode->FindElement((const int) atoi(argv[argptr+1])));
    1871                           FindNonConvexBorder(Boundary, TesselStruct, LCList, radius, NULL);
    1872                           CorrelationToSurfaceMap *surfacemap = NULL;
    1873                           if (periodic)
    1874                             surfacemap = PeriodicCorrelationToSurface( molecules, elements, TesselStruct, LCList, ranges);
    1875                           else
    1876                             surfacemap = CorrelationToSurface( molecules, elements, TesselStruct, LCList);
    1877                           OutputCorrelationToSurface(&output, surfacemap);
    1878                           // check whether radius was appropriate
    1879                           {
    1880                             double start; double end;
    1881                             GetMinMax( surfacemap, start, end);
    1882                             if (LCWidth < end)
    1883                               DoeLog(1) && (eLog()<< Verbose(1) << "Linked Cell width is smaller than the found range of values! Bins can only be correct up to: " << radius << "." << endl);
    1884                           }
    1885                           BinPairMap *binmap = BinData( surfacemap, BinWidth, BinStart, BinEnd );
    1886                           OutputCorrelation ( &binoutput, binmap );
    1887                           output.close();
    1888                           binoutput.close();
    1889                           counter = 0;
    1890                           for (MoleculeList::iterator BigFinder = molecules->ListOfMolecules.begin(); BigFinder != molecules->ListOfMolecules.end(); BigFinder++)
    1891                             (*BigFinder)->ActiveFlag = Actives[counter++];
    1892                           delete[](Actives);
    1893                           delete(LCList);
    1894                           delete(TesselStruct);
    1895                           delete(binmap);
    1896                           delete(surfacemap);
    1897                           argptr+=7;
    1898                         }
    1899                       }
     1801                      ArgcList.insert(argptr-1);
     1802                      ArgcList.insert(argptr);
     1803                      ArgcList.insert(argptr+1);
     1804                      ArgcList.insert(argptr+2);
     1805                      ArgcList.insert(argptr+3);
     1806                      ArgcList.insert(argptr+4);
     1807                      ArgcList.insert(argptr+5);
     1808                      ArgcList.insert(argptr+6);
     1809                      ArgcList.insert(argptr+7);
     1810                      ArgcList.insert(argptr+8);
     1811                      ArgcList.insert(argptr+9);
     1812                      ArgcList.insert(argptr+10);
     1813                      ArgcList.insert(argptr+11);
     1814                      ArgcList.insert(argptr+12);
     1815                      ArgcList.insert(argptr+13);
     1816                      ArgcList.insert(argptr+14);
     1817                      argptr+=15;
    19001818                      break;
    19011819
    … …  
    22372155                SaveFlag = true;
    22382156                DoLog(0) && (Log() << Verbose(0) << "Converting to prinicipal axis system." << endl);
     2157                mol->PrincipalAxisSystem((bool)j);
    22392158              } else
    2240                 DoLog(0) && (Log() << Verbose(0) << "Evaluating prinicipal axis." << endl);
    2241               mol->PrincipalAxisSystem((bool)j);
     2159                ArgcList.insert(argptr-1);
     2160                argptr+=0;
    22422161              break;
    22432162            case 'o':
    … …  
    23952314      // handle remaining arguments by CommandLineParser
    23962315      MapOfActions::getInstance().AddOptionsToParser();
    2397       CommandLineParser::getInstance().Run(ArgcSize,Arguments);
     2316      map <std::string, std::string> ShortFormToActionMap = MapOfActions::getInstance().getShortFormToActionMap();
     2317      CommandLineParser::getInstance().Run(ArgcSize,Arguments, ShortFormToActionMap);
    23982318      if (!CommandLineParser::getInstance().isEmpty()) {
    23992319        DoLog(0) && (Log() << Verbose(0) << "Setting UI to CommandLine." << endl);

  • src/moleculelist.cpp

    r0bcd11 r48c338  
    799799      strncat(molecules[i]->name, number, MAXSTRINGSIZE - strlen(mol->name) - 1);
    800800    }
    801     DoLog(1) && (Log() << Verbose(1) << "MolName is " << molecules[i]->name << endl);
     801    DoLog(1) && (Log() << Verbose(1) << "MolName is " << molecules[i]->name << ", id is " << molecules[i]->getId() << endl);
    802802    for (molecule::iterator iter = MolecularWalker->Leaf->begin(); iter != MolecularWalker->Leaf->end(); ++iter) {
    803803      DoLog(1) && (Log() << Verbose(1) << **iter << endl);

  • src/periodentafel.cpp

    r0bcd11 r48c338  
    7070 * \param *pointer element to be removed
    7171 */
    72 void periodentafel::RemoveElement(element * const pointer)
    73 {
    74   RemoveElement(pointer->getNumber());
     72size_t periodentafel::RemoveElement(element * const pointer)
     73{
     74  return RemoveElement(pointer->getNumber());
    7575};
    7676
    … …  
    7878 * \param Z element to be removed
    7979 */
    80 void periodentafel::RemoveElement(atomicNumber_t Z)
    81 {
    82   elements.erase(Z);
     80size_t periodentafel::RemoveElement(atomicNumber_t Z)
     81{
     82  return elements.erase(Z);
    8383};
    8484
    … …  
    233233  strncat(filename, STANDARDELEMENTSDB, MAXSTRINGSIZE-strlen(filename));
    234234  input.open(filename);
     235  if (!input.fail())
     236    DoLog(0) && (Log() << Verbose(0) << "Using " << filename << " as elements database." << endl);
    235237  status = status && LoadElementsDatabase(&input);
     238  input.close();
     239  input.clear();
    236240
    237241  // fill valence DB per element
    … …  
    240244  strncat(filename, STANDARDVALENCEDB, MAXSTRINGSIZE-strlen(filename));
    241245  input.open(filename);
     246  if (!input.fail())
     247    DoLog(0) && (Log() << Verbose(0) << "Using " << filename << " as valence database." << endl);
    242248  otherstatus = otherstatus && LoadValenceDatabase(&input);
     249  input.close();
     250  input.clear();
    243251
    244252  // fill orbitals DB per element
    … …  
    247255  strncat(filename, STANDARDORBITALDB, MAXSTRINGSIZE-strlen(filename));
    248256  input.open(filename);
     257  if (!input.fail())
     258    DoLog(0) && (Log() << Verbose(0) << "Using " << filename << " as orbitals database." << endl);
    249259  otherstatus = otherstatus && LoadOrbitalsDatabase(&input);
     260  input.close();
     261  input.clear();
    250262
    251263  // fill H-BondAngle DB per element
    … …  
    254266  strncat(filename, STANDARDHBONDANGLEDB, MAXSTRINGSIZE-strlen(filename));
    255267  input.open(filename);
     268  if (!input.fail())
     269    DoLog(0) && (Log() << Verbose(0) << "Using " << filename << " as H bond angle database." << endl);
    256270  otherstatus = otherstatus && LoadHBondAngleDatabase(&input);
     271  input.close();
     272  input.clear();
    257273
    258274  // fill H-BondDistance DB per element
    … …  
    261277  strncat(filename, STANDARDHBONDDISTANCEDB, MAXSTRINGSIZE-strlen(filename));
    262278  input.open(filename);
     279  if (!input.fail())
     280    DoLog(0) && (Log() << Verbose(0) << "Using " << filename << " as H bond length database." << endl);
    263281  otherstatus = otherstatus && LoadHBondLengthsDatabase(&input);
     282  input.close();
     283  input.clear();
    264284
    265285  if (!otherstatus){
    … …  
    278298  bool status = true;
    279299  int counter = 0;
     300  pair< std::map<atomicNumber_t,element*>::iterator, bool > InserterTest;
    280301  if (!(*input).fail()) {
    281302    (*input).getline(header1, MAXSTRINGSIZE);
    … …  
    303324      //(*input) >> ws;
    304325      (*input) >> ws;
    305       if (elements.count(neues->Z)) {// if element already present, remove and delete it
    306         element * const Elemental = FindElement(neues->Z);
    307         ASSERT(Elemental != NULL, "element should be present but is not??");
    308         RemoveElement(Elemental);
    309         delete(Elemental);
    310       }
    311326      //neues->Output((ofstream *)&cout);
    312       if ((neues->Z > 0) && (neues->Z < MAX_ELEMENTS)) {
    313         DoLog(0) && (Log() << Verbose(0) << " " << neues->symbol);
    314         elements[neues->getNumber()] = neues;
     327      if ((neues->getNumber() > 0) && (neues->getNumber() < MAX_ELEMENTS)) {
     328        if (elements.count(neues->getNumber())) {// if element already present, remove and delete old one (i.e. replace it)
     329          //cout << neues->symbol << " is present already." << endl;
     330          element * const Elemental = FindElement(neues->getNumber());
     331          ASSERT(Elemental != NULL, "element should be present but is not??");
     332          *Elemental = *neues;
     333        } else {
     334          InserterTest = elements.insert(pair <atomicNumber_t,element*> (neues->getNumber(), neues));
     335          ASSERT(InserterTest.second, "Could not insert new element into periodentafel on LoadElementsDatabase().");
     336        }
     337        DoLog(0) && (Log() << Verbose(0) << " " << elements[neues->getNumber()]->symbol);
    315338        counter++;
    316339      } else {
    … …  
    321344    }
    322345    DoLog(0) && (Log() << Verbose(0) << endl);
    323   } else
     346  } else {
     347    DoeLog(1) && (eLog() << Verbose(1) << "Could not open the database." << endl);
    324348    status = false;
     349  }
    325350
    326351  if (counter == 0)

  • src/periodentafel.hpp

    r0bcd11 r48c338  
    4444
    4545  iterator AddElement(element * const pointer);
    46   void RemoveElement(element * const pointer);
    47   void RemoveElement(atomicNumber_t);
     46  size_t RemoveElement(element * const pointer);
     47  size_t RemoveElement(atomicNumber_t);
    4848  void CleanupPeriodtable();
    4949  element * const FindElement(atomicNumber_t) const;

  • tests/regression/Analysis/3/post/bin_output.csv

    r0bcd11 r48c338  
    551.5     0
    662       0
    7 2.5     0
    8 3       0
    9 3.5     0
    10 4       0
    11 4.5     0
    12 5       3
    13 5.5     2
    14 6       3
     72.5     1
     83       1
     93.5     6
     104       7
     114.5     10
     125       8
     135.5     13
     146       5
    15156.5     6
    16 7       2
    17 7.5     5
    18 8       4
    19 8.5     5
    20 9       9
    21 9.5     9
    22 10      5
    23 10.5    7
    24 11      1
    25 11.5    1
     167       4
     177.5     1
     188       0
     198.5     0
     209       0
     219.5     0
     2210      0
     2310.5    0
     2411      0
     2511.5    0
    262612      0
    272712.5    0

  • tests/regression/testsuite-analysis.at

    r0bcd11 r48c338  
    44AT_KEYWORDS([analysis])
    55AT_CHECK([/bin/cp -f ${abs_top_srcdir}/${AUTOTEST_PATH}/Analysis/1/pre/test.conf .], 0)
    6 AT_CHECK([../../molecuilder test.conf -e ${abs_top_srcdir}/src/ -v 3 -C E 1 8 output.csv bin_output.csv 0 20], 0, [stdout], [stderr])
     6AT_CHECK([../../molecuilder test.conf -e ${abs_top_srcdir}/src/ -v 3 -C E --elements 1 8 --output-file output.csv --bin-output-file bin_output.csv --bin-start 0 --bin-end 20], 0, [stdout], [stderr])
    77AT_CHECK([fgrep "Begin of PairCorrelation" stdout], 0, [ignore], [ignore])
    88#AT_CHECK([file=output.csv; diff $file ${abs_top_srcdir}/${AUTOTEST_PATH}/Analysis/1/post/$file], 0, [ignore], [ignore])
    … …  
    1414AT_KEYWORDS([analysis])
    1515AT_CHECK([/bin/cp -f ${abs_top_srcdir}/${AUTOTEST_PATH}/Analysis/2/pre/test.conf .], 0)
    16 AT_CHECK([../../molecuilder test.conf -e ${abs_top_srcdir}/src/ -v 3 -C E 1 8 output-5.csv bin_output-5.csv 0 5], 0, [stdout], [stderr])
     16AT_CHECK([../../molecuilder test.conf -e ${abs_top_srcdir}/src/ -v 3 -C E --elements 1 8 --output-file output-5.csv --bin-output-file bin_output-5.csv --bin-start 0 --bin-end 5], 0, [stdout], [stderr])
    1717#AT_CHECK([file=output-5.csv; diff $file ${abs_top_srcdir}/${AUTOTEST_PATH}/Analysis/2/post/$file], 0, [ignore], [ignore])
    1818AT_CHECK([file=bin_output-5.csv; diff $file ${abs_top_srcdir}/${AUTOTEST_PATH}/Analysis/2/post/$file], 0, [ignore], [ignore])
    19 AT_CHECK([../../molecuilder test.conf -e ${abs_top_srcdir}/src/ -v 3 -C E 1 8 output-10.csv bin_output-10.csv 5 10], 0, [stdout], [stderr])
     19AT_CHECK([../../molecuilder test.conf -e ${abs_top_srcdir}/src/ -v 3 -C E --elements 1 8 --output-file output-10.csv --bin-output-file bin_output-10.csv --bin-start 5 --bin-end 10], 0, [stdout], [stderr])
    2020#AT_CHECK([file=output-10.csv; diff $file ${abs_top_srcdir}/${AUTOTEST_PATH}/Analysis/2/post/$file], 0, [ignore], [ignore])
    2121AT_CHECK([file=bin_output-10.csv; diff $file ${abs_top_srcdir}/${AUTOTEST_PATH}/Analysis/2/post/$file], 0, [ignore], [ignore])
    22 AT_CHECK([../../molecuilder test.conf -e ${abs_top_srcdir}/src/ -v 3 -C E 1 8 output-20.csv bin_output-20.csv 10 20], 0, [stdout], [stderr])
     22AT_CHECK([../../molecuilder test.conf -e ${abs_top_srcdir}/src/ -v 3 -C E --elements 1 8 --output-file output-20.csv --bin-output-file bin_output-20.csv --bin-start 10 --bin-end 20], 0, [stdout], [stderr])
    2323#AT_CHECK([file=output-20.csv; diff $file ${abs_top_srcdir}/${AUTOTEST_PATH}/Analysis/2/post/$file], 0, [ignore], [ignore])
    2424AT_CHECK([file=bin_output-20.csv; diff $file ${abs_top_srcdir}/${AUTOTEST_PATH}/Analysis/2/post/$file], 0, [ignore], [ignore])
    … …  
    2929AT_KEYWORDS([analysis])
    3030AT_CHECK([/bin/cp -f ${abs_top_srcdir}/${AUTOTEST_PATH}/Analysis/3/pre/test.conf .], 0)
    31 AT_CHECK([../../molecuilder test.conf -e ${abs_top_srcdir}/src/ -v 3 -C P 1 10. 10. 10. output.csv bin_output.csv 0 20], 0, [stdout], [stderr])
     31AT_CHECK([../../molecuilder test.conf -e ${abs_top_srcdir}/src/ -v 7 -C P --elements 1 --position 10. 10. 10. --output-file output.csv --bin-output-file bin_output.csv --bin-start 0 --bin-end 20], 0, [stdout], [stderr])
    3232AT_CHECK([fgrep "Begin of CorrelationToPoint" stdout], 0, [ignore], [ignore])
    3333#AT_CHECK([file=output.csv; diff $file ${abs_top_srcdir}/${AUTOTEST_PATH}/Analysis/3/post/$file], 0, [ignore], [ignore])
    … …  
    3939AT_KEYWORDS([analysis])
    4040AT_CHECK([/bin/cp -f ${abs_top_srcdir}/${AUTOTEST_PATH}/Analysis/4/pre/test.conf .], 0)
    41 AT_CHECK([../../molecuilder test.conf -e ${abs_top_srcdir}/src/ -v 3 -I -C S 1 output.csv bin_output.csv 1. 0 20], 0, [stdout], [stderr])
     41AT_CHECK([../../molecuilder test.conf -e ${abs_top_srcdir}/src/ -v 3 -I -C S --elements 1 --output-file output.csv --bin-output-file bin_output.csv --bin-start 0 --bin-width 1. --bin-end 20 --molecule-by-id 208], 0, [stdout], [stderr])
    4242AT_CHECK([fgrep "Begin of CorrelationToSurface" stdout], 0, [ignore], [ignore])
    4343#AT_CHECK([file=output.csv; diff $file ${abs_top_srcdir}/${AUTOTEST_PATH}/Analysis/4/post/$file], 0, [ignore], [ignore])
    … …  
    4545AT_CLEANUP
    4646
    47 # 4. principal axis system
    48 AT_SETUP([Analysis - principal axis system])
    49 AT_KEYWORDS([analysis])
    50 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/${AUTOTEST_PATH}/Analysis/5/pre/test.conf .], 0)
    51 AT_CHECK([../../molecuilder test.conf -e ${abs_top_srcdir}/src/ -v 3 -m 0], 0, [stdout], [stderr])
    52 AT_CHECK([fgrep "eigenvalue = 4382.53," stdout], 0, [ignore], [ignore])
    53 AT_CHECK([fgrep "eigenvalue = 4369.24," stdout], 0, [ignore], [ignore])
    54 AT_CHECK([fgrep "eigenvalue = 28.9359," stdout], 0, [ignore], [ignore])
    55 AT_CLEANUP
     47# 5. principal axis system
     48#AT_SETUP([Analysis - principal axis system])
     49#AT_KEYWORDS([analysis])
     50#AT_CHECK([/bin/cp -f ${abs_top_srcdir}/${AUTOTEST_PATH}/Analysis/5/pre/test.conf .], 0)
     51#AT_CHECK([../../molecuilder test.conf -e ${abs_top_srcdir}/src/ -v 3 -m 0], 0, [stdout], [stderr])
     52#AT_CHECK([fgrep "eigenvalue = 4382.53," stdout], 0, [ignore], [ignore])
     53#AT_CHECK([fgrep "eigenvalue = 4369.24," stdout], 0, [ignore], [ignore])
     54#AT_CHECK([fgrep "eigenvalue = 28.9359," stdout], 0, [ignore], [ignore])
     55#AT_CLEANUP
Note: See TracChangeset for help on using the changeset viewer.