nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ajout de std::vector

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1913 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
marieeleonore 2010-08-25 15:07:45 +00:00
commit a5762fc203
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/paradiseo-mo/src/problems/eval/moMaxSATincrEval.h
View file

@ -62,7 +62,7 @@ public :
unsigned int bit = _neighbor.index(); unsigned int bit = _neighbor.index();
// clauses which can be modified by the flipped bit // clauses which can be modified by the flipped bit
const vector<int> & modifiedClauses = variables[bit + 1] ; // remember that the variables start at index 1 and not 0 const std::vector<int> & modifiedClauses = variables[bit + 1] ; // remember that the variables start at index 1 and not 0
unsigned int size = modifiedClauses.size(); unsigned int size = modifiedClauses.size();
int nc; int nc;
@ -108,11 +108,11 @@ protected:
// list of clauses: // list of clauses:
// each clause has the number of the variable (from 1 to nbVar) // each clause has the number of the variable (from 1 to nbVar)
// when the value, litteral = not(variable) // when the value, litteral = not(variable)
vector<int> * clauses; std::vector<int> * clauses;
// list of variables: // list of variables:
// for each variable, the list of clauses // for each variable, the list of clauses
vector<int> * variables; std::vector<int> * variables;
//full eval of the max SAT //full eval of the max SAT
MaxSATeval<EOT> & fulleval; MaxSATeval<EOT> & fulleval;