gravatar
kpeter (Peter Kovacs)
kpeter@inf.elte.hu
Fix windows-specific compilation error (#429)
0 1 0
default
1 file changed with 2 insertions and 2 deletions:
↑ Collapse diff ↑
... ...
@@ -88,75 +88,75 @@
88 88
  maxcard.addSource(s);
89 89
  n = maxcard.nextNode();
90 90
   maxcard.processNextNode();
91 91
   maxcard.start();
92 92
   maxcard.run(s);
93 93
   maxcard.run();
94 94
 }
95 95

	
96 96
 void checkWithIntMap( std::istringstream& input)
97 97
 {
98 98
   typedef SmartDigraph Digraph;
99 99
   typedef Digraph::Node Node;
100 100
   typedef Digraph::ArcMap<int> CapMap;
101 101

	
102 102
   Digraph g;
103 103
   Node s,x,y,z,a;
104 104
   CapMap cap(g);
105 105

	
106 106
   DigraphReader<Digraph>(g,input).
107 107
     arcMap("capacity", cap).
108 108
     node("s",s).
109 109
     node("x",x).
110 110
     node("y",y).
111 111
     node("z",z).
112 112
     run();
113 113

	
114 114
   MaxCardinalitySearch<Digraph,CapMap> maxcard(g,cap);
115 115

	
116 116
   maxcard.init();
117 117
   maxcard.addSource(s);
118 118
   maxcard.start(x);
119 119

	
120
   check(maxcard.processed(s) and !maxcard.processed(x) and
120
   check(maxcard.processed(s) && !maxcard.processed(x) &&
121 121
         !maxcard.processed(y), "Wrong processed()!");
122 122

	
123 123
   a=maxcard.nextNode();
124 124
   check(maxcard.processNextNode()==a,
125 125
         "Wrong nextNode() or processNextNode() return value!");
126 126

	
127 127
   check(maxcard.processed(a), "Wrong processNextNode()!");
128 128

	
129 129
   maxcard.start();
130
   check(maxcard.cardinality(x)==2 and maxcard.cardinality(y)>=4,
130
   check(maxcard.cardinality(x)==2 && maxcard.cardinality(y)>=4,
131 131
         "Wrong cardinalities!");
132 132
 }
133 133

	
134 134
 void checkWithConst1Map(std::istringstream &input) {
135 135
   typedef SmartDigraph Digraph;
136 136
   typedef Digraph::Node Node;
137 137

	
138 138
   Digraph g;
139 139
   Node s,x,y,z;
140 140

	
141 141
  DigraphReader<Digraph>(g,input).
142 142
    node("s",s).
143 143
    node("x",x).
144 144
    node("y",y).
145 145
    node("z",z).
146 146
    run();
147 147

	
148 148
  MaxCardinalitySearch<Digraph> maxcard(g);
149 149
  maxcard.run(s);
150 150
  check(maxcard.cardinality(x)==1 &&
151 151
        maxcard.cardinality(y)+maxcard.cardinality(z)==3,
152 152
        "Wrong cardinalities!");
153 153
}
154 154

	
155 155
int main() {
156 156

	
157 157
  std::istringstream input1(test_lgf);
158 158
  checkWithIntMap(input1);
159 159

	
160 160
  std::istringstream input2(test_lgf);
161 161
  checkWithConst1Map(input2);
162 162
}
0 comments (0 inline)