Changes in src/molecule.cpp [68f03d:a67d19]

File:

• src/molecule.cpp (modified) (38 diffs)

src/molecule.cpp

@@ -6 +6 @@
 
 #include <cstring>
-#include <boost/bind.hpp>
-
-#include "World.hpp"
+
 #include "atom.hpp"
 #include "bond.hpp"
@@ -26 +24 @@
 #include "vector.hpp"
 #include "World.hpp"
-#include "Plane.hpp"
-#include "Exceptions/LinearDependenceException.hpp"
-
 
 /************************************* Functions for class molecule *********************************/
@@ -35 +30 @@
  * Initialises molecule list with correctly referenced start and end, and sets molecule::last_atom to zero.
  */
-molecule::molecule(const periodentafel * const teil) : elemente(teil), start(World::getInstance().createAtom()), end(World::getInstance().createAtom()),
+molecule::molecule(const periodentafel * const teil) : elemente(teil), start(new atom), end(new atom), 
   first(new bond(start, end, 1, -1)), last(new bond(start, end, 1, -1)), MDSteps(0), AtomCount(0), 
   BondCount(0), ElementCount(0), NoNonHydrogen(0), NoNonBonds(0), NoCyclicBonds(0), BondDistance(0.), 
-  ActiveFlag(false), IndexNr(-1),
-  formula(this,boost::bind(&molecule::calcFormula,this)),
-  last_atom(0),
-  InternalPointer(start)
+  ActiveFlag(false), IndexNr(-1), last_atom(0), InternalPointer(start)
 {
   // init atom chain list
@@ -54 +46 @@
   for(int i=MAX_ELEMENTS;i--;)
     ElementsInMolecule[i] = 0;
-  strcpy(name,World::getInstance().getDefaultName());
-};
-
-molecule *NewMolecule(){
-  return new molecule(World::getInstance().getPeriode());
-}
+  strcpy(name,World::get()->DefaultName);
+};
 
 /** Destructor of class molecule.
@@ -69 +57 @@
   delete(first);
   delete(last);
-  end->getWorld()->destroyAtom(end);
-  start->getWorld()->destroyAtom(start);
-};
-
-
-void DeleteMolecule(molecule *mol){
-  delete mol;
-}
-
-// getter and setter
-const std::string molecule::getName(){
-  return std::string(name);
-}
-
-void molecule::setName(const std::string _name){
-  OBSERVE;
-  strncpy(name,_name.c_str(),MAXSTRINGSIZE);
-}
-
-moleculeId_t molecule::getId(){
-  return id;
-}
-
-void molecule::setId(moleculeId_t _id){
-  id =_id;
-}
-
-const std::string molecule::getFormula(){
-  return *formula;
-}
-
-std::string molecule::calcFormula(){
-  std::map<atomicNumber_t,unsigned int> counts;
-  stringstream sstr;
-  periodentafel *periode = World::getInstance().getPeriode();
-  for(atom *Walker = start; Walker != end; Walker = Walker->next) {
-    counts[Walker->type->getNumber()]++;
-  }
-  std::map<atomicNumber_t,unsigned int>::reverse_iterator iter;
-  for(iter = counts.rbegin(); iter != counts.rend(); ++iter) {
-    atomicNumber_t Z = (*iter).first;
-    sstr << periode->FindElement(Z)->symbol << (*iter).second;
-  }
-  return sstr.str();
-}
+  delete(end);
+  delete(start);
+};
 
 
@@ -123 +69 @@
 bool molecule::AddAtom(atom *pointer)
 {
-  bool retval = false;
-  OBSERVE;
   if (pointer != NULL) {
     pointer->sort = &pointer->nr;
@@ -135 +79 @@
       if (pointer->type->Z != 1)
         NoNonHydrogen++;
-      if(pointer->getName() == "Unknown"){
-        stringstream sstr;
-        sstr << pointer->type->symbol << pointer->nr+1;
-        pointer->setName(sstr.str());
-      }
-    }
-    retval = add(pointer, end);
-  }
-  return retval;
+      if (pointer->Name == NULL) {
+        Free(&pointer->Name);
+        pointer->Name = Malloc<char>(6, "molecule::AddAtom: *pointer->Name");
+        sprintf(pointer->Name, "%2s%02d", pointer->type->symbol, pointer->nr+1);
+      }
+    }
+    return add(pointer, end);
+  } else
+    return false;
 };
 
@@ -153 +97 @@
 atom * molecule::AddCopyAtom(atom *pointer)
 {
-  atom *retval = NULL;
-  OBSERVE;
   if (pointer != NULL) {
-    atom *walker = pointer->clone();
-    stringstream sstr;
-    sstr << pointer->getName();
-    walker->setName(sstr.str());
+    atom *walker = new atom(pointer);
+    walker->Name = Malloc<char>(strlen(pointer->Name) + 1, "atom::atom: *Name");
+    strcpy (walker->Name, pointer->Name);
     walker->nr = last_atom++;  // increase number within molecule
     add(walker, end);
@@ -165 +106 @@
       NoNonHydrogen++;
     AtomCount++;
-    retval=walker;
-  }
-  return retval;
+    return walker;
+  } else
+    return NULL;
 };
 
@@ -206 +147 @@
 bool molecule::AddHydrogenReplacementAtom(bond *TopBond, atom *BottomOrigin, atom *TopOrigin, atom *TopReplacement, bool IsAngstroem)
 {
-  bool AllWentWell = true;    // flag gathering the boolean return value of molecule::AddAtom and other functions, as return value on exit
-  OBSERVE;
   double bondlength;  // bond length of the bond to be replaced/cut
   double bondangle;  // bond angle of the bond to be replaced/cut
   double BondRescale;   // rescale value for the hydrogen bond length
+  bool AllWentWell = true;    // flag gathering the boolean return value of molecule::AddAtom and other functions, as return value on exit
   bond *FirstBond = NULL, *SecondBond = NULL; // Other bonds in double bond case to determine "other" plane
   atom *FirstOtherAtom = NULL, *SecondOtherAtom = NULL, *ThirdOtherAtom = NULL; // pointer to hydrogen atoms to be added
@@ -218 +158 @@
   double *matrix = NULL;
   bond *Binder = NULL;
-  double * const cell_size = World::getInstance().getDomain();
+  double * const cell_size = World::get()->cell_size;
 
 //  Log() << Verbose(3) << "Begin of AddHydrogenReplacementAtom." << endl;
   // create vector in direction of bond
-  InBondvector = TopReplacement->x - TopOrigin->x;
+  InBondvector.CopyVector(&TopReplacement->x);
+  InBondvector.SubtractVector(&TopOrigin->x);
   bondlength = InBondvector.Norm();
 
@@ -234 +175 @@
     Orthovector1.Zero();
     for (int i=NDIM;i--;) {
-      l = TopReplacement->x[i] - TopOrigin->x[i];
+      l = TopReplacement->x.x[i] - TopOrigin->x.x[i];
       if (fabs(l) > BondDistance) { // is component greater than bond distance
-        Orthovector1[i] = (l < 0) ? -1. : +1.;
+        Orthovector1.x[i] = (l < 0) ? -1. : +1.;
       } // (signs are correct, was tested!)
     }
     matrix = ReturnFullMatrixforSymmetric(cell_size);
     Orthovector1.MatrixMultiplication(matrix);
-    InBondvector -= Orthovector1; // subtract just the additional translation
+    InBondvector.SubtractVector(&Orthovector1); // subtract just the additional translation
     Free(&matrix);
     bondlength = InBondvector.Norm();
@@ -253 +194 @@
   BondRescale = TopOrigin->type->HBondDistance[TopBond->BondDegree-1];
   if (BondRescale == -1) {
-    DoeLog(1) && (eLog()<< Verbose(1) << "There is no typical hydrogen bond distance in replacing bond (" << TopOrigin->getName() << "<->" << TopReplacement->getName() << ") of degree " << TopBond->BondDegree << "!" << endl);
+    DoeLog(1) && (eLog()<< Verbose(1) << "There is no typical hydrogen bond distance in replacing bond (" << TopOrigin->Name << "<->" << TopReplacement->Name << ") of degree " << TopBond->BondDegree << "!" << endl);
     return false;
     BondRescale = bondlength;
@@ -264 +205 @@
   switch(TopBond->BondDegree) {
     case 1:
-      FirstOtherAtom = World::getInstance().createAtom();    // new atom
+      FirstOtherAtom = new atom();    // new atom
       FirstOtherAtom->type = elemente->FindElement(1);  // element is Hydrogen
-      FirstOtherAtom->v = TopReplacement->v; // copy velocity
+      FirstOtherAtom->v.CopyVector(&TopReplacement->v); // copy velocity
       FirstOtherAtom->FixedIon = TopReplacement->FixedIon;
       if (TopReplacement->type->Z == 1) { // neither rescale nor replace if it's already hydrogen
@@ -274 +215 @@
         FirstOtherAtom->father = NULL;  // if we replace hydrogen, we mark it as our father, otherwise we are just an added hydrogen with no father
       }
-      InBondvector *= BondRescale;   // rescale the distance vector to Hydrogen bond length
-      FirstOtherAtom->x = TopOrigin->x; // set coordination to origin ...
-      FirstOtherAtom->x = InBondvector;  // ... and add distance vector to replacement atom
+      InBondvector.Scale(&BondRescale);   // rescale the distance vector to Hydrogen bond length
+      FirstOtherAtom->x.CopyVector(&TopOrigin->x); // set coordination to origin ...
+      FirstOtherAtom->x.AddVector(&InBondvector);  // ... and add distance vector to replacement atom
       AllWentWell = AllWentWell && AddAtom(FirstOtherAtom);
 //      Log() << Verbose(4) << "Added " << *FirstOtherAtom << " at: ";
@@ -296 +237 @@
             SecondOtherAtom = (*Runner)->GetOtherAtom(TopOrigin);
           } else {
-            DoeLog(2) && (eLog()<< Verbose(2) << "Detected more than four bonds for atom " << TopOrigin->getName());
+            DoeLog(2) && (eLog()<< Verbose(2) << "Detected more than four bonds for atom " << TopOrigin->Name);
           }
         }
@@ -308 +249 @@
 
         // determine the plane of these two with the *origin
-        try {
-          Orthovector1 =Plane(TopOrigin->x, FirstOtherAtom->x, SecondOtherAtom->x).getNormal();
-        }
-        catch(LinearDependenceException &excp){
-          Log() << Verbose(0) << excp;
-          // TODO: figure out what to do with the Orthovector in this case
-          AllWentWell = false;
-        }
+        AllWentWell = AllWentWell && Orthovector1.MakeNormalVector(&TopOrigin->x, &FirstOtherAtom->x, &SecondOtherAtom->x);
       } else {
-        Orthovector1.GetOneNormalVector(InBondvector);
+        Orthovector1.GetOneNormalVector(&InBondvector);
       }
       //Log() << Verbose(3)<< "Orthovector1: ";
@@ -323 +257 @@
       //Log() << Verbose(0) << endl;
       // orthogonal vector and bond vector between origin and replacement form the new plane
-      Orthovector1.MakeNormalTo(InBondvector);
+      Orthovector1.MakeNormalVector(&InBondvector);
       Orthovector1.Normalize();
       //Log() << Verbose(3) << "ReScaleCheck: " << Orthovector1.Norm() << " and " << InBondvector.Norm() << "." << endl;
 
       // create the two Hydrogens ...
-      FirstOtherAtom = World::getInstance().createAtom();
-      SecondOtherAtom = World::getInstance().createAtom();
+      FirstOtherAtom = new atom();
+      SecondOtherAtom = new atom();
       FirstOtherAtom->type = elemente->FindElement(1);
       SecondOtherAtom->type = elemente->FindElement(1);
-      FirstOtherAtom->v = TopReplacement->v; // copy velocity
+      FirstOtherAtom->v.CopyVector(&TopReplacement->v); // copy velocity
       FirstOtherAtom->FixedIon = TopReplacement->FixedIon;
-      SecondOtherAtom->v = TopReplacement->v; // copy velocity
+      SecondOtherAtom->v.CopyVector(&TopReplacement->v); // copy velocity
       SecondOtherAtom->FixedIon = TopReplacement->FixedIon;
       FirstOtherAtom->father = NULL;  // we are just an added hydrogen with no father
@@ -340 +274 @@
       bondangle = TopOrigin->type->HBondAngle[1];
       if (bondangle == -1) {
-        DoeLog(1) && (eLog()<< Verbose(1) << "There is no typical hydrogen bond angle in replacing bond (" << TopOrigin->getName() << "<->" << TopReplacement->getName() << ") of degree " << TopBond->BondDegree << "!" << endl);
+        DoeLog(1) && (eLog()<< Verbose(1) << "There is no typical hydrogen bond angle in replacing bond (" << TopOrigin->Name << "<->" << TopReplacement->Name << ") of degree " << TopBond->BondDegree << "!" << endl);
         return false;
         bondangle = 0;
@@ -355 +289 @@
       SecondOtherAtom->x.Zero();
       for(int i=NDIM;i--;) { // rotate by half the bond angle in both directions (InBondvector is bondangle = 0 direction)
-        FirstOtherAtom->x[i] = InBondvector[i] * cos(bondangle) + Orthovector1[i] * (sin(bondangle));
-        SecondOtherAtom->x[i] = InBondvector[i] * cos(bondangle) + Orthovector1[i] * (-sin(bondangle));
-      }
-      FirstOtherAtom->x *= BondRescale;  // rescale by correct BondDistance
-      SecondOtherAtom->x *= BondRescale;
+        FirstOtherAtom->x.x[i] = InBondvector.x[i] * cos(bondangle) + Orthovector1.x[i] * (sin(bondangle));
+        SecondOtherAtom->x.x[i] = InBondvector.x[i] * cos(bondangle) + Orthovector1.x[i] * (-sin(bondangle));
+      }
+      FirstOtherAtom->x.Scale(&BondRescale);  // rescale by correct BondDistance
+      SecondOtherAtom->x.Scale(&BondRescale);
       //Log() << Verbose(3) << "ReScaleCheck: " << FirstOtherAtom->x.Norm() << " and " << SecondOtherAtom->x.Norm() << "." << endl;
       for(int i=NDIM;i--;) { // and make relative to origin atom
-        FirstOtherAtom->x[i] += TopOrigin->x[i];
-        SecondOtherAtom->x[i] += TopOrigin->x[i];
+        FirstOtherAtom->x.x[i] += TopOrigin->x.x[i];
+        SecondOtherAtom->x.x[i] += TopOrigin->x.x[i];
       }
       // ... and add to molecule
@@ -383 +317 @@
     case 3:
       // take the "usual" tetraoidal angle and add the three Hydrogen in direction of the bond (height of the tetraoid)
-      FirstOtherAtom = World::getInstance().createAtom();
-      SecondOtherAtom = World::getInstance().createAtom();
-      ThirdOtherAtom = World::getInstance().createAtom();
+      FirstOtherAtom = new atom();
+      SecondOtherAtom = new atom();
+      ThirdOtherAtom = new atom();
       FirstOtherAtom->type = elemente->FindElement(1);
       SecondOtherAtom->type = elemente->FindElement(1);
       ThirdOtherAtom->type = elemente->FindElement(1);
-      FirstOtherAtom->v = TopReplacement->v; // copy velocity
+      FirstOtherAtom->v.CopyVector(&TopReplacement->v); // copy velocity
       FirstOtherAtom->FixedIon = TopReplacement->FixedIon;
-      SecondOtherAtom->v = TopReplacement->v; // copy velocity
+      SecondOtherAtom->v.CopyVector(&TopReplacement->v); // copy velocity
       SecondOtherAtom->FixedIon = TopReplacement->FixedIon;
-      ThirdOtherAtom->v = TopReplacement->v; // copy velocity
+      ThirdOtherAtom->v.CopyVector(&TopReplacement->v); // copy velocity
       ThirdOtherAtom->FixedIon = TopReplacement->FixedIon;
       FirstOtherAtom->father = NULL;  //  we are just an added hydrogen with no father
@@ -400 +334 @@
 
       // we need to vectors orthonormal the InBondvector
-      AllWentWell = AllWentWell && Orthovector1.GetOneNormalVector(InBondvector);
+      AllWentWell = AllWentWell && Orthovector1.GetOneNormalVector(&InBondvector);
 //      Log() << Verbose(3) << "Orthovector1: ";
 //      Orthovector1.Output(out);
 //      Log() << Verbose(0) << endl;
-      try{
-        Orthovector2 = Plane(InBondvector, Orthovector1,0).getNormal();
-      }
-      catch(LinearDependenceException &excp) {
-        Log() << Verbose(0) << excp;
-        AllWentWell = false;
-      }
+      AllWentWell = AllWentWell && Orthovector2.MakeNormalVector(&InBondvector, &Orthovector1);
 //      Log() << Verbose(3) << "Orthovector2: ";
 //      Orthovector2.Output(out);
@@ -427 +355 @@
       factors[1] = f;
       factors[2] = 0.;
-      FirstOtherAtom->x.LinearCombinationOfVectors(InBondvector, Orthovector1, Orthovector2, factors);
+      FirstOtherAtom->x.LinearCombinationOfVectors(&InBondvector, &Orthovector1, &Orthovector2, factors);
       factors[1] = -0.5*f;
       factors[2] = g;
-      SecondOtherAtom->x.LinearCombinationOfVectors(InBondvector, Orthovector1, Orthovector2, factors);
+      SecondOtherAtom->x.LinearCombinationOfVectors(&InBondvector, &Orthovector1, &Orthovector2, factors);
       factors[2] = -g;
-      ThirdOtherAtom->x.LinearCombinationOfVectors(InBondvector, Orthovector1, Orthovector2, factors);
+      ThirdOtherAtom->x.LinearCombinationOfVectors(&InBondvector, &Orthovector1, &Orthovector2, factors);
 
       // rescale each to correct BondDistance
@@ -440 +368 @@
 
       // and relative to *origin atom
-      FirstOtherAtom->x += TopOrigin->x;
-      SecondOtherAtom->x += TopOrigin->x;
-      ThirdOtherAtom->x += TopOrigin->x;
+      FirstOtherAtom->x.AddVector(&TopOrigin->x);
+      SecondOtherAtom->x.AddVector(&TopOrigin->x);
+      ThirdOtherAtom->x.AddVector(&TopOrigin->x);
 
       // ... and add to molecule
@@ -485 +413 @@
 bool molecule::AddXYZFile(string filename)
 {
-
   istringstream *input = NULL;
   int NumberOfAtoms = 0; // atom number in xyz read
@@ -499 +426 @@
     return false;
 
-  OBSERVE;
   getline(xyzfile,line,'\n'); // Read numer of atoms in file
   input = new istringstream(line);
@@ -510 +436 @@
     MDSteps++;
   for(i=0;i<NumberOfAtoms;i++){
-    Walker = World::getInstance().createAtom();
+    Walker = new atom;
     getline(xyzfile,line,'\n');
     istringstream *item = new istringstream(line);
@@ -530 +456 @@
     }
     for(j=NDIM;j--;) {
-      Walker->x[j] = x[j];
-      Walker->Trajectory.R.at(MDSteps-1)[j] = x[j];
-      Walker->Trajectory.U.at(MDSteps-1)[j] = 0;
-      Walker->Trajectory.F.at(MDSteps-1)[j] = 0;
+      Walker->x.x[j] = x[j];
+      Walker->Trajectory.R.at(MDSteps-1).x[j] = x[j];
+      Walker->Trajectory.U.at(MDSteps-1).x[j] = 0;
+      Walker->Trajectory.F.at(MDSteps-1).x[j] = 0;
     }
     AddAtom(Walker);  // add to molecule
@@ -548 +474 @@
 molecule *molecule::CopyMolecule()
 {
-  molecule *copy = World::getInstance().createMolecule();
+  molecule *copy = new molecule(elemente);
   atom *LeftAtom = NULL, *RightAtom = NULL;
 
@@ -591 +517 @@
  */
 molecule* molecule::CopyMoleculeFromSubRegion(const Vector offset, const double *parallelepiped) const {
-  molecule *copy = World::getInstance().createMolecule();
+  molecule *copy = new molecule(elemente);
 
   ActOnCopyWithEachAtomIfTrue ( &molecule::AddCopyAtom, copy, &atom::IsInParallelepiped, offset, parallelepiped );
@@ -617 +543 @@
     add(Binder, last);
   } else {
-    DoeLog(1) && (eLog()<< Verbose(1) << "Could not add bond between " << atom1->getName() << " and " << atom2->getName() << " as one or both are not present in the molecule." << endl);
+    DoeLog(1) && (eLog()<< Verbose(1) << "Could not add bond between " << atom1->Name << " and " << atom2->Name << " as one or both are not present in the molecule." << endl);
   }
   return Binder;
@@ -677 +603 @@
 void molecule::SetBoxDimension(Vector *dim)
 {
-  double * const cell_size = World::getInstance().getDomain();
-  cell_size[0] = dim->at(0);
+  double * const cell_size = World::get()->cell_size;
+  cell_size[0] = dim->x[0];
   cell_size[1] = 0.;
-  cell_size[2] = dim->at(1);
+  cell_size[2] = dim->x[1];
   cell_size[3] = 0.;
   cell_size[4] = 0.;
-  cell_size[5] = dim->at(2);
+  cell_size[5] = dim->x[2];
 };
 
@@ -696 +622 @@
     AtomCount--;
   } else
-    DoeLog(1) && (eLog()<< Verbose(1) << "Atom " << pointer->getName() << " is of element " << pointer->type->Z << " but the entry in the table of the molecule is 0!" << endl);
+    DoeLog(1) && (eLog()<< Verbose(1) << "Atom " << pointer->Name << " is of element " << pointer->type->Z << " but the entry in the table of the molecule is 0!" << endl);
   if (ElementsInMolecule[pointer->type->Z] == 0)  // was last atom of this element?
     ElementCount--;
@@ -714 +640 @@
     ElementsInMolecule[pointer->type->Z]--; // decrease number of atom of this element
   else
-    DoeLog(1) && (eLog()<< Verbose(1) << "Atom " << pointer->getName() << " is of element " << pointer->type->Z << " but the entry in the table of the molecule is 0!" << endl);
+    DoeLog(1) && (eLog()<< Verbose(1) << "Atom " << pointer->Name << " is of element " << pointer->type->Z << " but the entry in the table of the molecule is 0!" << endl);
   if (ElementsInMolecule[pointer->type->Z] == 0)  // was last atom of this element?
     ElementCount--;
@@ -768 +694 @@
 bool molecule::CheckBounds(const Vector *x) const
 {
-  double * const cell_size = World::getInstance().getDomain();
+  double * const cell_size = World::get()->cell_size;
   bool result = true;
   int j =-1;
   for (int i=0;i<NDIM;i++) {
     j += i+1;
-    result = result && ((x->at(i) >= 0) && (x->at(i) < cell_size[j]));
+    result = result && ((x->x[i] >= 0) && (x->x[i] < cell_size[j]));
   }
   //return result;
@@ -916 +842 @@
         if (Walker->type->Z != 1) // count non-hydrogen atoms whilst at it
           NoNonHydrogen++;
-        stringstream sstr;
-        sstr << Walker->type->symbol << Walker->nr+1;
-        Walker->setName(sstr.str());
-        DoLog(3) && (Log() << Verbose(3) << "Naming atom nr. " << Walker->nr << " " << Walker->getName() << "." << endl);
+        Free(&Walker->Name);
+        Walker->Name = Malloc<char>(6, "molecule::CountAtoms: *walker->Name");
+        sprintf(Walker->Name, "%2s%02d", Walker->type->symbol, Walker->nr+1);
+        DoLog(3) && (Log() << Verbose(3) << "Naming atom nr. " << Walker->nr << " " << Walker->Name << "." << endl);
         i++;
       }
@@ -1023 +949 @@
     DeterminePeriodicCenter(CenterOfGravity);
     OtherMolecule->DeterminePeriodicCenter(OtherCenterOfGravity);
-    DoLog(5) && (Log() << Verbose(5) << "Center of Gravity: " << CenterOfGravity << endl);
-    DoLog(5) && (Log() << Verbose(5) << "Other Center of Gravity: " << OtherCenterOfGravity << endl);
-    if (CenterOfGravity.DistanceSquared(OtherCenterOfGravity) > threshold*threshold) {
+    DoLog(5) && (Log() << Verbose(5) << "Center of Gravity: ");
+    CenterOfGravity.Output();
+    DoLog(0) && (Log() << Verbose(0) << endl << Verbose(5) << "Other Center of Gravity: ");
+    OtherCenterOfGravity.Output();
+    DoLog(0) && (Log() << Verbose(0) << endl);
+    if (CenterOfGravity.DistanceSquared(&OtherCenterOfGravity) > threshold*threshold) {
       DoLog(4) && (Log() << Verbose(4) << "Centers of gravity don't match." << endl);
       result = false;
@@ -1156 +1085 @@
   }
 };
-
-void molecule::flipActiveFlag(){
-  ActiveFlag = !ActiveFlag;
-}