← Back to branch summary

~ubuntu-branches/debian/wheezy/abyss/wheezy

« back to all changes in this revision

Viewing changes to Graph/AdjIO.h

  • Committer: Package Import Robot
  • Author(s): Shaun Jackman
  • Date: 2012-05-31 11:39:13 UTC
  • mfrom: (1.1.5)
  • Revision ID: package-import@ubuntu.com-20120531113913-39atrfritvjevhv6
Tags: 1.3.4-1
* New upstream release.
* debian/copyright: Add CityHash, which has an Expat license.
* debian/control: Bump Standards-Version to 3.9.3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Graph/AdjIO.h
44
44
                if (get(vertex_removed, g, *u))
45
45
                        continue;
46
46
                if (!sense)
47
 
                        out << ContigID(*u) << get(vertex_bundle, g, *u);
 
47
                        out << get(vertex_contig_name, g, *u)
 
48
                                << get(vertex_bundle, g, *u);
48
49
                out << "\t;";
49
50
                std::pair<out_edge_iterator, out_edge_iterator>
50
51
                        adj = out_edges(*u, g);
51
52
                for (out_edge_iterator e = adj.first; e != adj.second; ++e) {
52
53
                        vertex_descriptor v = target(*e, g);
53
54
                        assert(!get(vertex_removed, g, v));
54
 
                        out << ' ' << (v ^ sense);
 
55
                        out << ' ' << get(vertex_name, g, v ^ sense);
55
56
                        write_edge_prop(out, get(edge_bundle, g, e));
56
57
                }
57
58
                if (sense)
69
70
        typedef typename graph_traits<Graph>::vertex_descriptor V;
70
71
        typedef typename graph_traits<Graph>::edge_descriptor E;
71
72
        typedef typename Graph::edge_property_type EP;
72
 
        for (std::string id; getline(in >> std::ws, id, ',');) {
73
 
                assert(!id.empty());
74
 
                V v(id);
75
 
                v = v ^ u.sense();
 
73
        for (std::string vname; getline(in >> std::ws, vname, ',');) {
 
74
                assert(!vname.empty());
 
75
                V v = find_vertex(vname, g);
 
76
                v = v ^ get(vertex_sense, g, u);
76
77
                EP ep;
77
78
                in >> ep;
78
79
                assert(in);
142
143
                assert(in.eof());
143
144
        }
144
145
        assert(num_vertices(g) > 0);
145
 
        ContigID::lock();
 
146
        g_contigNames.lock();
146
147
 
147
148
        if (faiFormat)
148
149
                return in;
151
152
        in.clear();
152
153
        in.seekg(std::ios_base::beg);
153
154
        assert(in);
154
 
        for (ContigID id; in >> id;) {
 
155
        for (std::string name; in >> name;) {
155
156
                if (adjFormat)
156
157
                        in >> Ignore(';');
157
 
                vertex_descriptor u(id, false);
 
158
                vertex_descriptor u = find_vertex(name, false, g);
158
159
                for (int sense = false; sense <= true; ++sense) {
159
160
                        std::string s;
160
161
                        getline(in, s, !sense ? ';' : '\n');
163
164
                        if (!adjFormat) {
164
165
                                readDistEdges(ss, g, u ^ sense, betterEP);
165
166
                        } else
166
 
                        for (vertex_descriptor v; ss >> v >> std::ws;) {
 
167
                        for (std::string vname; ss >> vname >> std::ws;) {
 
168
                                vertex_descriptor v = find_vertex(vname, g);
167
169
                                assert(!edge(u ^ sense, v ^ sense, g).second);
168
170
                                if (ss.peek() == '[') {
169
171
                                        ss.get();