Skip to content

Commit e09a34d

Browse files
committed
fixed wrong usage of induced flag
1 parent 5103eca commit e09a34d

File tree

9 files changed

+2306708
-13
lines changed

9 files changed

+2306708
-13
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
CC=g++
2-
CFLAGS= -std=c++11 -march=native -O3 -Wno-deprecated
2+
CFLAGS= -std=c++11 -O3 -Wno-deprecated
33
LDFLAGS= -lpthread -latomic
44
CPPFLAGS= -I./include
55

6-
all: vf3 vf3p vf3l
6+
all: vf3 vf3l
77

88
vf3:
99
$(CC) $(CFLAGS) $(CPPFLAGS) -o bin/$@ main.cpp -DVF3

bin/vf3

92.5 KB
Binary file not shown.

bin/vf3l

89.9 KB
Binary file not shown.

include/MatchingEngine.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ namespace vflib
109109
virtual void ResetSolutionCounter()
110110
{
111111
solCount = 0;
112+
solutions.clear();
112113
}
113114

114115
inline struct timeval GetFirstSolutionTime()
@@ -300,7 +301,6 @@ namespace vflib
300301
{
301302
VFState s1(s);
302303
s1.AddPair(n1, n2);
303-
304304
#ifdef TRACE
305305
// feasible candidate
306306
trace->SetFeasible();

include/Options.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ bool GetOptions(Options &opt, int argc, char **argv)
115115
case 'r':
116116
opt.repetitionTimeLimit = atof(optarg);
117117
break;
118-
case 'u':
118+
case 'u':
119119
opt.undirected = true;
120120
break;
121121
case 'v':

include/VF3LightSubState.hpp

-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ namespace vflib
3131
class VF3LightSubState : public State
3232
{
3333
private:
34-
bool induced;
35-
3634
//Comparison functors for nodes and edges
3735
NodeComparisonFunctor nf;
3836
EdgeComparisonFunctor ef;

include/VF3SubState.hpp

-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ namespace vflib
3232
class VF3SubState : public State
3333
{
3434
private:
35-
36-
bool induced;
3735
//Comparison functors for nodes and edges
3836
NodeComparisonFunctor nf;
3937
EdgeComparisonFunctor ef;

main.cpp

+3-5
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ int32_t main(int32_t argc, char** argv)
188188

189189
state_t s0(&patt_graph, &targ_graph, class_patt.data(), class_targ.data(), classes_count, sorted.data());
190190
me->FindAllMatchings(s0);
191-
192191
#ifdef TRACE
193192
me->FlushTrace();
194193
#endif
@@ -216,7 +215,6 @@ int32_t main(int32_t argc, char** argv)
216215
}
217216
}
218217

219-
220218
#endif
221219
sols = me->GetSolutionsCount();
222220
if(opt.verbose)
@@ -226,10 +224,10 @@ int32_t main(int32_t argc, char** argv)
226224
std::cout<<"Solutions: "<<sols<<std::endl;
227225
}else
228226
{
229-
std::cout << sols << " " << timeFirst << " " << timeAll;
227+
std::cout << sols << " " << timeFirst << " " << timeAll <<std::endl;
230228
}
231229
delete me;
232-
delete pattloader;
233-
delete targloader;
230+
delete pattloader;
231+
delete targloader;
234232
return 0;
235233
}

0 commit comments

Comments
 (0)