Commit 171bbb0b authored by Vedran Miletić's avatar Vedran Miletić

Remove extra semicolon after member function definition

parent 4f3b7ab9
......@@ -23,19 +23,19 @@ public:
///////////////////
// Constructors
///////////////////
RbtCell(){evaluated = false; name = "";constant = false;};
RbtCell(){evaluated = false; name = "";constant = false;}
RbtCell(const RbtCell& c)
{evaluated = c.evaluated; name = c.name; constant = c.constant;
result = c.result;};
result = c.result;}
///////////////////
// Destructor
//////////////////
virtual ~RbtCell(){};
virtual ~RbtCell(){}
RbtBool Evaluated()const {return evaluated;};
RbtBool Named()const {return (name != "");};
RbtBool Constant()const {return constant ;};
RbtBool Evaluated()const {return evaluated;}
RbtBool Named()const {return (name != "");}
RbtBool Constant()const {return constant ;}
void Clear()
{
if (!constant)
......@@ -43,19 +43,19 @@ public:
evaluated = false;
name = "";
}
};
RbtReturnType GetResult()const {return result;};
RbtString GetName()const {return name;};
}
RbtReturnType GetResult()const {return result;}
RbtString GetName()const {return name;}
void SetName(RbtString s)
{name = s; };
{name = s; }
void SetResult(RbtReturnType r)
{result = r; evaluated = true;};
{result = r; evaluated = true;}
void SetConstant(RbtReturnType r)
{result = r; evaluated = true; constant = true;
ostrstream nm; nm << r << ends; name = nm.str();};
ostrstream nm; nm << r << ends; name = nm.str();}
void ResetConstant()
{ evaluated = false; name = "";
if (constant) constant = false; else cout <<"ERROR\n";};
if (constant) constant = false; else cout <<"ERROR\n";}
private:
RbtBool evaluated, constant;
......
......@@ -27,12 +27,12 @@ public:
virtual RbtString GetName() = 0;
virtual void SetArg(int i, RbtReturnType f) = 0;// { *(Arg[i]) = f;};
virtual void SetNameArg(int i, RbtString& n) = 0;// { NameArg[i] = n;};
static void Clear() {ntabs = 0;};
static void Clear() {ntabs = 0;}
///////////////////
// Destructor
//////////////////
virtual ~RbtCommand(){};
virtual ~RbtCommand(){}
static RbtInt ntabs;
static RbtBool inside;
......@@ -40,7 +40,7 @@ protected:
///////////////////
// Constructors
///////////////////
RbtCommand(){}; // Default constructor disabled
RbtCommand(){} // Default constructor disabled
RbtString tabs(RbtInt n)
{
RbtString st = "";
......@@ -60,16 +60,16 @@ typedef RbtCommandList::const_iterator RbtCommandListConstIter;
class AddCommand : public RbtCommand
{
public:
int GetNArgs() { return 2; };
int GetNArgs() { return 2; }
RbtString GetName()
{ return ("(" + NameArg[0] + "+ " + NameArg[1] + ")");};
AddCommand(){}; //{Arg = RbtReturnType(2);};
void SetArg(int i, RbtReturnType f) { Arg[i] = f;};
void SetNameArg(int i, RbtString& n) { NameArg[i] = n;};
{ return ("(" + NameArg[0] + "+ " + NameArg[1] + ")");}
AddCommand(){} //{Arg = RbtReturnType(2);}
void SetArg(int i, RbtReturnType f) { Arg[i] = f;}
void SetNameArg(int i, RbtString& n) { NameArg[i] = n;}
RbtReturnType Execute()
{
return Arg[0] + Arg[1];
};
}
private:
RbtReturnType Arg[2];
RbtString NameArg[2];
......@@ -78,16 +78,16 @@ private:
class SubCommand : public RbtCommand
{
public:
int GetNArgs() { return 2; };
int GetNArgs() { return 2; }
RbtString GetName()
{ return ("(" + NameArg[0] + "- " + NameArg[1]+")");};
void SetArg(int i, RbtReturnType f) { Arg[i] = f;};
void SetNameArg(int i, RbtString& n) { NameArg[i] = n;};
SubCommand(){};
{ return ("(" + NameArg[0] + "- " + NameArg[1]+")");}
void SetArg(int i, RbtReturnType f) { Arg[i] = f;}
void SetNameArg(int i, RbtString& n) { NameArg[i] = n;}
SubCommand(){}
RbtReturnType Execute()
{
return Arg[0] - Arg[1];
};
}
private:
RbtReturnType Arg[2];
RbtString NameArg[2];
......@@ -96,16 +96,16 @@ private:
class MulCommand : public RbtCommand
{
public:
int GetNArgs() { return 2; };
int GetNArgs() { return 2; }
RbtString GetName()
{ return ("(" + NameArg[0] + "* " + NameArg[1] + ")");};
void SetArg(int i, RbtReturnType f) { Arg[i] = f;};
void SetNameArg(int i, RbtString& n) { NameArg[i] = n;};
MulCommand(){};
{ return ("(" + NameArg[0] + "* " + NameArg[1] + ")");}
void SetArg(int i, RbtReturnType f) { Arg[i] = f;}
void SetNameArg(int i, RbtString& n) { NameArg[i] = n;}
MulCommand(){}
RbtReturnType Execute()
{
return Arg[0] * Arg[1];
};
}
private:
RbtReturnType Arg[2];
RbtString NameArg[2];
......@@ -114,18 +114,18 @@ private:
class DivCommand : public RbtCommand
{
public:
int GetNArgs() { return 2; };
int GetNArgs() { return 2; }
RbtString GetName()
{ return ("(" + NameArg[0] + "div " + NameArg[1]+ ")");};
DivCommand(){};
void SetArg(int i, RbtReturnType f) { Arg[i] = f;};
void SetNameArg(int i, RbtString& n) { NameArg[i] = n;};
{ return ("(" + NameArg[0] + "div " + NameArg[1]+ ")");}
DivCommand(){}
void SetArg(int i, RbtReturnType f) { Arg[i] = f;}
void SetNameArg(int i, RbtString& n) { NameArg[i] = n;}
RbtReturnType Execute()
{
if (fabs(Arg[1]) < 0.000001)
return Arg[0];
return Arg[0] / Arg[1];
};
}
private:
RbtReturnType Arg[2];
RbtString NameArg[2];
......@@ -134,7 +134,7 @@ private:
class IfCommand : public RbtCommand
{
public:
int GetNArgs() { return 3; };
int GetNArgs() { return 3; }
RbtString GetName()
{
// return ("\niff(" + NameArg[0] + "," + NameArg[1] + "," +
......@@ -145,16 +145,16 @@ public:
return ("\n" + tabs(ntabs - 1) + "if " + NameArg[0] + "> 0 then\n" +
tabs(ntabs) + NameArg[1] + "\n" + tabs(ntabs - 1)
+ "else \n" + tabs(ntabs) + NameArg[2]+"\n" +
tabs(ntabs - 1) + "end\n" );};
IfCommand(){};
void SetArg(int i, RbtReturnType f) { Arg[i] = f;};
void SetNameArg(int i, RbtString& n) {NameArg[i] = n;};
tabs(ntabs - 1) + "end\n" );}
IfCommand(){}
void SetArg(int i, RbtReturnType f) { Arg[i] = f;}
void SetNameArg(int i, RbtString& n) {NameArg[i] = n;}
RbtReturnType Execute()
{
if (Arg[0] > 0.0)
return Arg[1];
return Arg[2];
};
}
private:
RbtReturnType Arg[3];
RbtString NameArg[3];
......@@ -163,18 +163,18 @@ private:
class LogCommand : public RbtCommand
{
public:
int GetNArgs() { return 1; };
int GetNArgs() { return 1; }
RbtString GetName()
{ return ("log(" + NameArg[0] + ")");};
LogCommand(){};
void SetArg(int i, RbtReturnType f) { Arg[i] = f;};
void SetNameArg(int i, RbtString& n) { NameArg[i] = n;};
{ return ("log(" + NameArg[0] + ")");}
LogCommand(){}
void SetArg(int i, RbtReturnType f) { Arg[i] = f;}
void SetNameArg(int i, RbtString& n) { NameArg[i] = n;}
RbtReturnType Execute()
{
if (fabs(Arg[0]) < 0.000001)
return 0;
return (log(fabs(Arg[0])));
};
}
private:
RbtReturnType Arg[1];
RbtString NameArg[1];
......@@ -183,12 +183,12 @@ private:
class ExpCommand : public RbtCommand
{
public:
int GetNArgs() { return 1; };
int GetNArgs() { return 1; }
RbtString GetName()
{ return ("exp(" + NameArg[0] + ")");};
ExpCommand(){};
void SetArg(int i, RbtReturnType f) { Arg[i] = f;};
void SetNameArg(int i, RbtString& n) { NameArg[i] = n;};
{ return ("exp(" + NameArg[0] + ")");}
ExpCommand(){}
void SetArg(int i, RbtReturnType f) { Arg[i] = f;}
void SetNameArg(int i, RbtString& n) { NameArg[i] = n;}
RbtReturnType Execute()
{
if (Arg[0] > 200)
......@@ -196,7 +196,7 @@ public:
if (Arg[0] < -200)
return 0;
return exp(Arg[0]);
};
}
private:
RbtReturnType Arg[2];
RbtString NameArg[2];
......
......@@ -39,16 +39,16 @@ public:
ostream& Print(ostream&) const;
friend ostream& operator<<(ostream& s, const RbtGPChromosome &p);
friend istream& operator>>(istream& s, RbtGPChromosome &p);
const int& operator[] (int idx) const {return chrom[idx];};
int& operator[] (int idx) {return chrom[idx];};
const int& operator[] (int idx) const {return chrom[idx];}
int& operator[] (int idx) {return chrom[idx];}
RbtGPChromosome& operator=(const RbtGPChromosome& c);
RbtInt size() const {return chrom.size();};
RbtInt size() const {return chrom.size();}
RbtCellPtr Cells(RbtInt idx) const
{return (cells[idx]);}
void SetConstant(RbtReturnType, RbtInt);
void ResetConstant(RbtInt);
RbtInt GetStartingCell() { return (chrom[chrom.size() - 1]); };
RbtReturnType GetRCte(RbtInt ncell) { return cells[ncell]->GetResult();};
RbtInt GetStartingCell() { return (chrom[chrom.size() - 1]); }
RbtReturnType GetRCte(RbtInt ncell) { return cells[ncell]->GetResult();}
RbtCommands GetCommand(RbtInt ncell)
{
if (ncell < nProgramInputs)
......
......@@ -28,9 +28,9 @@ class RbtGPFFCHK1 : public RbtGPFitnessFunction
public:
static RbtString _CT;
RbtGPFFCHK1(RbtContextPtr c) : contextp(c)
{_RBTOBJECTCOUNTER_CONSTR_(_CT);};
{_RBTOBJECTCOUNTER_CONSTR_(_CT);}
virtual ~RbtGPFFCHK1()
{_RBTOBJECTCOUNTER_DESTR_(_CT);};
{_RBTOBJECTCOUNTER_DESTR_(_CT);}
void ReadTables(istream&,RbtReturnTypeArray&,RbtReturnTypeArray&);
RbtDouble CalculateFitness(RbtGPGenomePtr,RbtReturnTypeArray&,
......
......@@ -27,9 +27,9 @@ class RbtGPFFHSP90 : public RbtGPFitnessFunction
public:
static RbtString _CT;
RbtGPFFHSP90(RbtContextPtr c) : contextp(c)
{_RBTOBJECTCOUNTER_CONSTR_(_CT);};
{_RBTOBJECTCOUNTER_CONSTR_(_CT);}
virtual ~RbtGPFFHSP90()
{_RBTOBJECTCOUNTER_DESTR_(_CT);};
{_RBTOBJECTCOUNTER_DESTR_(_CT);}
void ReadTables(istream&,RbtReturnTypeArray&,RbtReturnTypeArray&);
RbtDouble CalculateFitness(RbtGPGenomePtr,RbtReturnTypeArray&,
......
......@@ -28,9 +28,9 @@ class RbtGPFFSpike : public RbtGPFitnessFunction
public:
static RbtString _CT;
RbtGPFFSpike(RbtContextPtr c) : contextp(c)
{_RBTOBJECTCOUNTER_CONSTR_(_CT);};
{_RBTOBJECTCOUNTER_CONSTR_(_CT);}
virtual ~RbtGPFFSpike()
{_RBTOBJECTCOUNTER_DESTR_(_CT);};
{_RBTOBJECTCOUNTER_DESTR_(_CT);}
void ReadTables(istream&,RbtReturnTypeArray&,RbtReturnTypeArray&);
RbtDouble CalculateFitness(RbtGPGenomePtr,RbtReturnTypeArray&,
......
......@@ -40,18 +40,18 @@ public:
virtual ~RbtGPGenome();
static void SetStructure(RbtInt, RbtInt, RbtInt, RbtInt,
RbtInt, RbtInt, RbtInt, RbtInt);
static RbtInt GetNIP(){return npi;} ;
static void SetNIP(RbtInt n){ npi = n;} ;
static RbtInt GetNIF(){return nfi;} ;
static RbtInt GetNN(){return nn;} ;
static RbtInt GetNO(){return no;} ;
static RbtInt GetNSFI(){return nsfi;} ;
static void SetNSFI(RbtInt n){nsfi = n;} ;
RbtGPChromosomePtr GetChrom() const {return (new RbtGPChromosome(*chrom));} ;
static RbtInt GetNIP(){return npi;}
static void SetNIP(RbtInt n){ npi = n;}
static RbtInt GetNIF(){return nfi;}
static RbtInt GetNN(){return nn;}
static RbtInt GetNO(){return no;}
static RbtInt GetNSFI(){return nsfi;}
static void SetNSFI(RbtInt n){nsfi = n;}
RbtGPChromosomePtr GetChrom() const {return (new RbtGPChromosome(*chrom));}
void Initialise();
void Mutate(RbtDouble);
void SetFitness(RbtDouble f){fitness = f;};
RbtDouble GetFitness()const{return fitness;};
void SetFitness(RbtDouble f){fitness = f;}
RbtDouble GetFitness()const{return fitness;}
void UniformCrossover(const RbtGPGenome&, const RbtGPGenome&);
void Crossover(RbtGPGenome&);
friend ostream& operator<<(ostream& s, const RbtGPGenome &p);
......
......@@ -42,8 +42,8 @@ public:
friend ostream& operator<<(ostream& s, const RbtGPParser &p);
RbtReturnTypeList Parse(RbtGPChromosomePtr,RbtReturnTypeList&);
RbtString PrintParse(istream&,RbtGPChromosomePtr,RbtBool,RbtBool);
RbtBool IsConstantInt(RbtInt i) { return (i == CINT);};
RbtBool IsConstantFloat(RbtInt i) { return (i == CFLOAT);};
RbtBool IsConstantInt(RbtInt i) { return (i == CINT);}
RbtBool IsConstantFloat(RbtInt i) { return (i == CFLOAT);}
private:
/////////////////////
......
......@@ -69,7 +69,7 @@ class RbtAromIdxSF : public RbtBaseInterSF, public RbtBaseIdxSF, public RbtAnnot
struct f1prms {
RbtDouble R0,DRMin,DRMax,slope;
f1prms(RbtDouble R, RbtDouble DMin, RbtDouble DMax)
: R0(R),DRMin(DMin),DRMax(DMax),slope(1.0/(DMax-DMin)) {};
: R0(R),DRMin(DMin),DRMax(DMax),slope(1.0/(DMax-DMin)) {}
};
inline f1prms GetRprms() const {return f1prms(m_R12,m_DR12Min,m_DR12Max);}
......@@ -78,7 +78,7 @@ class RbtAromIdxSF : public RbtBaseInterSF, public RbtBaseIdxSF, public RbtAnnot
//Generic scoring function primitive (deviation from ideal geometry)
inline RbtDouble f1(RbtDouble DR, const f1prms& prms) const {
return (DR > prms.DRMax) ? 0.0 : (DR > prms.DRMin) ? 1.0-prms.slope*(DR-prms.DRMin) : 1.0;
};
}
//The actual aromatic score, between a given interaction center and a list of near neighbour centers
RbtDouble AromScore(const RbtInteractionCenter* pIC1, const RbtInteractionCenterList& IC2List,
......
......@@ -120,16 +120,16 @@ class RbtAtom
RbtBool GetEnabled() const;
//AtomId
RbtInt GetAtomId() const {return m_nAtomId;};
void SetAtomId(const RbtInt nAtomId) {m_nAtomId = nAtomId;};
RbtInt GetAtomId() const {return m_nAtomId;}
void SetAtomId(const RbtInt nAtomId) {m_nAtomId = nAtomId;}
//AtomicNo
RbtInt GetAtomicNo() const {return m_nAtomicNo;};
void SetAtomicNo(const RbtInt nAtomicNo) {m_nAtomicNo = nAtomicNo;};
RbtInt GetAtomicNo() const {return m_nAtomicNo;}
void SetAtomicNo(const RbtInt nAtomicNo) {m_nAtomicNo = nAtomicNo;}
//AtomName
RbtString GetAtomName() const {return m_strAtomName;};
void SetAtomName(const RbtString strAtomName) {m_strAtomName = strAtomName;};
RbtString GetAtomName() const {return m_strAtomName;}
void SetAtomName(const RbtString strAtomName) {m_strAtomName = strAtomName;}
RbtString GetFullAtomName() const;//Returns composite of segment name, subunit id and name, and atom name
//SubunitId
......
......@@ -49,7 +49,7 @@ class RbtBaseBiMolTransform : public RbtBaseTransform
//PURE VIRTUAL - Derived classes must override
virtual void SetupReceptor() = 0;//Called by Update when receptor is changed
virtual void SetupLigand() = 0;//Called by Update when ligand is changed
virtual void SetupSolvent() {};//Called by Update when ligand is changed
virtual void SetupSolvent() {}//Called by Update when ligand is changed
virtual void SetupTransform() = 0;//Called by Update when either model has changed
private:
......
......@@ -50,7 +50,7 @@ class RbtBaseInterSF : public virtual RbtBaseSF
//PURE VIRTUAL - Derived classes must override
virtual void SetupReceptor() = 0;//Called by Update when receptor is changed
virtual void SetupLigand() = 0;//Called by Update when ligand is changed
virtual void SetupSolvent() {};//Called by Update when solvent is changed
virtual void SetupSolvent() {}//Called by Update when solvent is changed
virtual void SetupScore() = 0;//Called by Update when either model has changed
private:
......
......@@ -38,10 +38,10 @@ class RbtBaseMolecularDataSource
////////////////
RbtString GetName() {return m_strName;} //Returns source identifier string
virtual RbtBool isTitleListSupported() {return false;};
virtual RbtBool isAtomListSupported() {return false;};
virtual RbtBool isCoordinatesSupported() {return false;};
virtual RbtBool isBondListSupported() {return false;};
virtual RbtBool isTitleListSupported() {return false;}
virtual RbtBool isAtomListSupported() {return false;}
virtual RbtBool isCoordinatesSupported() {return false;}
virtual RbtBool isBondListSupported() {return false;}
//Pure virtual - derived classes must override
......@@ -61,7 +61,7 @@ class RbtBaseMolecularDataSource
//DM 12 May 1999 - support for data records (e.g. SD file)
//Does source support data records (default=false)
virtual RbtBool isDataSupported() {return false;};
virtual RbtBool isDataSupported() {return false;}
//Get number of data fields
virtual RbtInt GetNumData() throw (RbtError) = 0;
//Get list of field names as string list
......
......@@ -38,7 +38,7 @@ class RbtBaseMolecularFileSink : public RbtBaseFileSink
//Derived classes should override
//Controls whether file type can support the writing of multiple conformations/models to a single file
virtual RbtBool isMultiConfSupported() {return false;};
virtual RbtBool isMultiConfSupported() {return false;}
//Get/set the RbtModel that is linked to the sink
RbtModelPtr GetModel() const;
......
......@@ -44,7 +44,7 @@ class RbtCavity
}
//Destructor
~RbtCavity() {};
~RbtCavity() {}
///////////////////////////////////////////////
//Stream functions
......@@ -54,7 +54,7 @@ class RbtCavity
friend ostream& operator<<(ostream& s, const RbtCavity& cavity) {
cavity.Print(s);
return s;
};
}
//Virtual function for dumping cavity details to an output stream
//Derived classes can override if required
......
......@@ -25,7 +25,7 @@ class RbtCavityGridSF : public RbtBaseInterSF
//i.e. those atoms that have the potential to move outside of the cavity
class HeavyAtomFactory : public RbtFlexDataVisitor {
public:
HeavyAtomFactory() {};
HeavyAtomFactory() {}
HeavyAtomFactory(RbtModelList modelList);
virtual void VisitReceptorFlexData(RbtReceptorFlexData*);
virtual void VisitLigandFlexData(RbtLigandFlexData*);
......
......@@ -110,7 +110,7 @@ class RbtChromElement {
//Invalid operation in base class
virtual void Add(RbtChromElement* pChromElement) throw (RbtError);
//Prints details of element to stream (null implementation in base class)
virtual void Print(ostream& s) const {};
virtual void Print(ostream& s) const {}
//
//NON-VIRTUAL METHODS
//
......
......@@ -27,7 +27,7 @@ public:
///////////////////
// Constructors
///////////////////
RbtCommands(const RbtCommands& c): name(c.name), nargs(c.nargs){};
RbtCommands(const RbtCommands& c): name(c.name), nargs(c.nargs){}
inline RbtCommands(RbtInt ncomm)
{
name = RbtCommName(ncomm);
......@@ -54,35 +54,35 @@ public:
nargs = 0;
break;
}
};
}
inline RbtCommName GetName() const
{
return name;
};
}
inline RbtInt GetNArgs() const
{
return nargs;
};
}
inline RbtBool IsAdd()const {return (name == ADD);};
inline RbtBool IsSub()const {return (name == SUB);};
inline RbtBool IsMul()const {return (name == MUL);};
inline RbtBool IsDiv()const {return (name == DIV);};
inline RbtBool IsIf()const {return (name == IF);};
inline RbtBool IsLog()const {return (name == LOG);};
inline RbtBool IsExp()const {return (name == EXP);};
inline RbtBool IsRCte()const {return (name == RCTE);};
inline RbtBool IsAnd()const {return (name == AND);};
inline RbtBool IsAdd()const {return (name == ADD);}
inline RbtBool IsSub()const {return (name == SUB);}
inline RbtBool IsMul()const {return (name == MUL);}
inline RbtBool IsDiv()const {return (name == DIV);}
inline RbtBool IsIf()const {return (name == IF);}
inline RbtBool IsLog()const {return (name == LOG);}
inline RbtBool IsExp()const {return (name == EXP);}
inline RbtBool IsRCte()const {return (name == RCTE);}
inline RbtBool IsAnd()const {return (name == AND);}
///////////////////
// Destructor
//////////////////
virtual ~RbtCommands(){};
virtual ~RbtCommands(){}
virtual void copy(const RbtCommands &c) { name = c.name; nargs = c.nargs;};
virtual void copy(const RbtCommands &c) { name = c.name; nargs = c.nargs;}
////////////////////
// Private methods
......
......@@ -32,9 +32,9 @@ class RbtConstSF : public RbtBaseInterSF
virtual void ScoreMap(RbtStringVariantMap& scoreMap) const;
protected:
virtual void SetupReceptor() {};
virtual void SetupLigand() {};
virtual void SetupScore() {};
virtual void SetupReceptor() {}
virtual void SetupLigand() {}
virtual void SetupScore() {}
virtual RbtDouble RawScore() const;
void ParameterUpdated(const RbtString& strName);
......
......@@ -41,8 +41,8 @@ public:
ostream& Print(ostream&) const;
friend ostream& operator<<(ostream&, const RbtConstraint &);
RbtCoord GetCoords() const { return coord; };
RbtDouble GetTolerance() const { return tolerance; };
RbtCoord GetCoords() const { return coord; }
RbtDouble GetTolerance() const { return tolerance; }
virtual void AddAtomList(RbtModelPtr, RbtBool bCheck=true) = 0;
RbtDouble Score() const;
......@@ -82,7 +82,7 @@ namespace Rbt {
class RbtHeavyConstraint : public RbtConstraint
{
public:
RbtHeavyConstraint(RbtCoord c, RbtDouble t) : RbtConstraint(c,t) {};
RbtHeavyConstraint(RbtCoord c, RbtDouble t) : RbtConstraint(c,t) {}
void AddAtomList(RbtModelPtr, RbtBool bCheck=true) throw(RbtError);
static RbtInt counter;
};
......@@ -90,7 +90,7 @@ class RbtHeavyConstraint : public RbtConstraint
class RbtHBAConstraint : public RbtConstraint
{
public:
RbtHBAConstraint(RbtCoord c, RbtDouble t) : RbtConstraint(c,t) {};
RbtHBAConstraint(RbtCoord c, RbtDouble t) : RbtConstraint(c,t) {}
void AddAtomList(RbtModelPtr, RbtBool bCheck=true) throw(RbtError);
static RbtInt counter;
};
......@@ -98,7 +98,7 @@ class RbtHBAConstraint : public RbtConstraint
class RbtHBDConstraint : public RbtConstraint
{
public:
RbtHBDConstraint(RbtCoord c, RbtDouble t) : RbtConstraint(c,t){};
RbtHBDConstraint(RbtCoord c, RbtDouble t) : RbtConstraint(c,t){}
void AddAtomList(RbtModelPtr, RbtBool bCheck=true) throw(RbtError);
static RbtInt counter;
};
......@@ -106,7 +106,7 @@ class RbtHBDConstraint : public RbtConstraint
class RbtHydroConstraint : public RbtConstraint
{
public:
RbtHydroConstraint(RbtCoord c, RbtDouble t) : RbtConstraint(c,t){};
RbtHydroConstraint(RbtCoord c, RbtDouble t) : RbtConstraint(c,t){}
void AddAtomList(RbtModelPtr, RbtBool bCheck=true) throw(RbtError);
static RbtInt counter;
};
......@@ -114,7 +114,7 @@ class RbtHydroConstraint : public RbtConstraint
class RbtHydroAliphaticConstraint : public RbtConstraint
{
public:
RbtHydroAliphaticConstraint(RbtCoord c, RbtDouble t) : RbtConstraint(c,t){};
RbtHydroAliphaticConstraint(RbtCoord c, RbtDouble t) : RbtConstraint(c,t){}
void AddAtomList(RbtModelPtr, RbtBool bCheck=true) throw(RbtError);
static RbtInt counter;
};
......@@ -122,7 +122,7 @@ class RbtHydroAliphaticConstraint : public RbtConstraint
class RbtHydroAromaticConstraint : public RbtConstraint
{
public:
RbtHydroAromaticConstraint(RbtCoord c, RbtDouble t) : RbtConstraint(c,t){};
RbtHydroAromaticConstraint(RbtCoord c, RbtDouble t) : RbtConstraint(c,t){}
void AddAtomList(RbtModelPtr, RbtBool bCheck=true) throw(RbtError);
static RbtInt counter;
};
......@@ -131,7 +131,7 @@ class RbtHydroAromaticConstraint : public RbtConstraint
class RbtNegChargeConstraint : public RbtConstraint
{
public:
RbtNegChargeConstraint(RbtCoord c, RbtDouble t) : RbtConstraint(c,t){};
RbtNegChargeConstraint(RbtCoord c, RbtDouble t) : RbtConstraint(c,t){}
void AddAtomList(RbtModelPtr, RbtBool bCheck=true) throw(RbtError);
static RbtInt counter;
};
......@@ -139,7 +139,7 @@ class RbtNegChargeConstraint : public RbtConstraint
class RbtPosChargeConstraint : public RbtConstraint
{
public:
RbtPosChargeConstraint(RbtCoord c, RbtDouble t) : RbtConstraint(c,t){};
RbtPosChargeConstraint(RbtCoord c, RbtDouble t) : RbtConstraint(c,t){}
void AddAtomList(RbtModelPtr, RbtBool bCheck=true) throw(RbtError);
static RbtInt counter;
};
......@@ -147,7 +147,7 @@ class RbtPosChargeConstraint : public RbtConstraint
class RbtRingAromaticConstraint : public RbtConstraint
{
public:
RbtRingAromaticConstraint(RbtCoord c, RbtDouble t) : RbtConstraint(c,t){};
RbtRingAromaticConstraint(RbtCoord c, RbtDouble t) : RbtConstraint(c,t){}
void AddAtomList(RbtModelPtr, RbtBool bCheck=true) throw(RbtError);
static RbtInt counter;
};
......
......@@ -86,8 +86,8 @@ public:
// RbtReturnType GetValue(RbtInt key) {return vm[key].GetValue();}
// RbtString GetName(RbtString){return "";}
// RbtReturnType GetValue(RbtString){return 0.0;}
const RbtVble& GetVble(RbtInt key){ return *(vm[key]);};
void SetVble(RbtInt key, const RbtVble& v){ *(vm[key]) = v;};
const RbtVble& GetVble(RbtInt key){ return *(vm[key]);}
void SetVble(RbtInt key, const RbtVble& v){ *(vm[key]) = v;}
const RbtVble& GetVble(RbtString key)
{
throw RbtError (_WHERE_, "This is not a string context");
......@@ -138,7 +138,7 @@ public:
{
throw RbtError (_WHERE_, "This is not a cell context");
}
void SetVble(RbtInt key, const RbtVble& v){ *(vm[""]) = v;};
void SetVble(RbtInt key, const RbtVble& v){ *(vm[""]) = v;}
void UpdateLigs(RbtModelPtr lig);
void UpdateSite(RbtModelPtr rec, RbtDockingSitePtr site);
void UpdateScores(RbtBaseSF* spSF, RbtModelPtr lig);
......
......@@ -34,7 +34,7 @@ class RbtCrdFileSink : public RbtBaseMolecularFileSink
//
//Derived classes should override
//Controls whether file type can support the writing of multiple conformations/models to a single file
virtual RbtBool isMultiConfSupported() {return true;};
virtual RbtBool isMultiConfSupported() {return true;}
//
////////////////////////////////////////
//Override public methods from RbtBaseFileSink
......
......@@ -29,10 +29,10 @@ class RbtCrdFileSource : public RbtBaseMolecularFileSource
////////////////////////////////////////
//Override public methods from RbtBaseMolecularDataSource
virtual RbtBool isTitleListSupported() {return true;};
virtual RbtBool isAtomListSupported() {return true;};
virtual RbtBool isCoordinatesSupported() {return true;};
virtual RbtBool isBondListSupported() {return false;};
virtual RbtBool isTitleListSupported() {return true;}
virtual RbtBool isAtomListSupported() {return true;}
virtual RbtBool isCoordinatesSupported() {return true;}
virtual RbtBool isBondListSupported() {return false;}