Skip to content

Commit 6f56aee

Browse files
author
Hervé Rouault
committed
break long lines
1 parent 3d396a3 commit 6f56aee

13 files changed

+1782
-1393
lines changed

src/cellule.cpp

+548-425
Large diffs are not rendered by default.

src/cellule.hpp

+68-67
Original file line numberDiff line numberDiff line change
@@ -26,79 +26,80 @@
2626

2727
extern int mode;
2828

29-
typedef vector<double> vd;
29+
typedef vector < double >vd;
3030
typedef vd::iterator ivd;
3131

32-
class Cellule
33-
{
34-
public:
35-
double score;
36-
double score_auxi;
37-
vector<Protein *> proteins;
38-
vector<Gene *> genes;
39-
vector<Promoter *> promoters;
40-
vector<Arn *> arns;
41-
vector<Reaction *> reactions;
32+
class Cellule {
33+
public:
34+
double score;
35+
double score_auxi;
36+
vector < Protein * >proteins;
37+
vector < Gene * >genes;
38+
vector < Promoter * >promoters;
39+
vector < Arn * >arns;
40+
vector < Reaction * >reactions;
4241

43-
Cellule();
44-
~Cellule();
45-
Protein * addprotein(double c = frand2(), double q = frand2());
46-
Protein * fusion(Protein * prot1, Protein * prot2);
47-
Reaction * adddimere(Protein * prot1, Protein * prot2, double c = 0.2 * frand2(),
48-
double q = frand2(), double cdimerisation = frand2());
49-
Reaction * addreaction(Espece * react1, Espece * react2, Espece * prod1,
50-
Espece * prod2, double c = frand2());
51-
Reaction * addrandreact();
52-
void phosphorylation(Protein * prot);
53-
void addphospho();
54-
Reaction * addrandactiv();
55-
Gene * addgene();
56-
Promoter * addpromotion(Gene * gene, Protein * prot, double e = frand2() * 0.2,
57-
double t = frand2());
58-
void rmreaction(Reaction * r);
59-
bool rmrandprot();
60-
bool rmrandpromo();
61-
bool compprot(Protein & prot1, Protein & prot2);
62-
void evolution();
63-
bool evolution_modifq();
64-
bool evolution_ajout();
65-
void optievolution();
66-
void calculscore();
67-
double scorefunction(vector<double> fonction, vector<double> resultatintegr);
68-
double calculscorebistable();
69-
double calculscoremultistable();
70-
double calculscoremultistable2();
71-
double calculscoreporte();
72-
double calculscoreoscill();
73-
double scorebioscill();
74-
Cellule * copycellule();
75-
void printgraph(ostream & out);
76-
void printinternpart(ostream & out);
77-
void printproperties(ostream & out);
78-
void printcellule(ostream & out);
79-
void printcelluleshort(ostream & out);
80-
void printcelluleintegr(ostream & out);
81-
void printintegration(ostream & out);
82-
//void printintegrationmultistable(ostream &out);
83-
void prtbioscill();
84-
bool addclivage();
85-
Cellule * optimisation();
86-
Protein * existe(Protein * prot);
87-
Protein * searchcopyprot(Protein * prot);
88-
void opticalculscore();
89-
/*double calculscoreporteinter();*/
90-
int especenum(Espece * pesp);
91-
string especestring(Espece * pesp);
92-
int reactionnum(Reaction * react);
93-
string reactionstring(Reaction * react);
94-
void printintegr(ostream & stre, double fint);
95-
void copygene(Gene * gene);
42+
Cellule();
43+
~Cellule();
44+
Protein *addprotein(double c = frand2(), double q = frand2());
45+
Protein *fusion(Protein * prot1, Protein * prot2);
46+
Reaction *adddimere(Protein * prot1, Protein * prot2, double c =
47+
0.2 * frand2(), double q =
48+
frand2(), double cdimerisation = frand2());
49+
Reaction *addreaction(Espece * react1, Espece * react2, Espece * prod1,
50+
Espece * prod2, double c = frand2());
51+
Reaction *addrandreact();
52+
void phosphorylation(Protein * prot);
53+
void addphospho();
54+
Reaction *addrandactiv();
55+
Gene *addgene();
56+
Promoter *addpromotion(Gene * gene, Protein * prot, double e =
57+
frand2() * 0.2, double t = frand2());
58+
void rmreaction(Reaction * r);
59+
bool rmrandprot();
60+
bool rmrandpromo();
61+
bool compprot(Protein & prot1, Protein & prot2);
62+
void evolution();
63+
bool evolution_modifq();
64+
bool evolution_ajout();
65+
void optievolution();
66+
void calculscore();
67+
double scorefunction(vector < double >fonction,
68+
vector < double >resultatintegr);
69+
double calculscorebistable();
70+
double calculscoremultistable();
71+
double calculscoremultistable2();
72+
double calculscoreporte();
73+
double calculscoreoscill();
74+
double scorebioscill();
75+
Cellule *copycellule();
76+
void printgraph(ostream & out);
77+
void printinternpart(ostream & out);
78+
void printproperties(ostream & out);
79+
void printcellule(ostream & out);
80+
void printcelluleshort(ostream & out);
81+
void printcelluleintegr(ostream & out);
82+
void printintegration(ostream & out);
83+
//void printintegrationmultistable(ostream &out);
84+
void prtbioscill();
85+
bool addclivage();
86+
Cellule *optimisation();
87+
Protein *existe(Protein * prot);
88+
Protein *searchcopyprot(Protein * prot);
89+
void opticalculscore();
90+
/*double calculscoreporteinter(); */
91+
int especenum(Espece * pesp);
92+
string especestring(Espece * pesp);
93+
int reactionnum(Reaction * react);
94+
string reactionstring(Reaction * react);
95+
void printintegr(ostream & stre, double fint);
96+
void copygene(Gene * gene);
9697
};
9798

98-
typedef vector<Cellule *> vcell;
99+
typedef vector < Cellule * >vcell;
99100

100101
typedef vcell::iterator ivcell;
101102

102-
void * calcsc_thr(void * cell);
103+
void *calcsc_thr(void *cell);
103104

104-
#endif /* Cellule_H */
105+
#endif /* Cellule_H */

0 commit comments

Comments
 (0)