Index: ../trunk-jpl/src/m/modules/Chaco.m =================================================================== --- ../trunk-jpl/src/m/modules/Chaco.m (revision 0) +++ ../trunk-jpl/src/m/modules/Chaco.m (revision 20859) @@ -0,0 +1,22 @@ +function [assgn] = Chaco(A,vwgts,ewgts,x,y,z,options,nparts,goal); +%CHACO +% +% Usage: +% [assgn] = Chaco(A,vwgts,ewgts,x,y,z,options,nparts,goal); +% +% A: Input adjacency matrix +% vwgts: weights for all vertices +% ewgts: weights for all edges +% x,y,z: coordinates for inertial method +% options: architecture and partitioning options +% nparts: number of parts options +% goal: desired set sizes + +% Check usage +if nargin~=9 + help Chaco + error('Wrong usage (see above)'); +end + +% Call mex module +[assgn] = Chaco_matlab(A,vwgts,ewgts,x,y,z,options,nparts,goal); Index: ../trunk-jpl/src/wrappers/matlab/Makefile.am =================================================================== --- ../trunk-jpl/src/wrappers/matlab/Makefile.am (revision 20858) +++ ../trunk-jpl/src/wrappers/matlab/Makefile.am (revision 20859) @@ -66,7 +66,7 @@ Xy2ll.la if CHACO -lib_LTLIBRARIES += Chaco.la +lib_LTLIBRARIES += Chaco_matlab.la endif if KRIGING lib_LTLIBRARIES += Kriging.la @@ -150,8 +150,8 @@ BamgTriangulate_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB) if CHACO -Chaco_la_SOURCES = ../Chaco/Chaco.cpp -Chaco_la_LIBADD = ${deps} $(MPILIB) $(CHACOLIB) $(GSLLIB) $(PROJ4LIB) $(PETSCLIB) +Chaco_matlab_la_SOURCES = ../Chaco/Chaco.cpp +Chaco_matlab_la_LIBADD = ${deps} $(MPILIB) $(CHACOLIB) $(GSLLIB) $(PROJ4LIB) $(PETSCLIB) endif ContourToMesh_matlab_la_SOURCES = ../ContourToMesh/ContourToMesh.cpp