Skip to content

Matrix Market files use 1-indexed coordinate entries #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tkonolige wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Matrix Market files use 1-indexed coordinate entries #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1156fd2
Matrix market files use 1-indexed coordinate entries
tkonolige Dec 9, 2015
1f8dd5f
forgot the header
tkonolige Dec 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion system/graph/TupleGraph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ TupleGraph TupleGraph::load_tsv( std::string path ) {
}

/// Matrix Market format loader
TupleGraph TupleGraph::load_mm( std::string path ) {
TupleGraph TupleGraph::load_mm( std::string path, bool one_indexed ) {
// make sure file exists
CHECK( fs::exists( path ) ) << "File not found.";
CHECK( fs::is_regular_file( path ) ) << "File is not a regular file.";
Expand Down Expand Up @@ -442,8 +442,10 @@ TupleGraph TupleGraph::load_mm( std::string path ) {
std::getline( infile, str );
} else {
infile >> v0;
if(one_indexed) v0--;
if( !infile.good() ) break;
infile >> v1;
if(one_indexed) v1--;
if( header_info.field_double ) {
double d;
infile >> d;
Expand Down
2 changes: 1 addition & 1 deletion system/graph/TupleGraph.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ namespace Grappa {
void save_generic( std::string, void (*f)( const char *, Edge*, Edge*) );

static TupleGraph load_tsv( std::string path );
static TupleGraph load_mm( std::string path );
static TupleGraph load_mm( std::string path, bool one_indexed = true );

public:
GlobalAddress<Edge> edges;
Expand Down