[GRASS-SVN] r33440 - grass/branches/develbranch_6/swig/python/interfaces

[svn_grass at osgeo.org]

Author: hamish
Date: 2008-09-14 02:59:56 -0400 (Sun, 14 Sep 2008)
New Revision: 33440

Modified:
   grass/branches/develbranch_6/swig/python/interfaces/imagedefs.i
   grass/branches/develbranch_6/swig/python/interfaces/imagery.i
Log:
trac #308. make PySwig build again (but still needs work): cluster fns moved out of imagery lib

Modified: grass/branches/develbranch_6/swig/python/interfaces/imagedefs.i
===================================================================
--- grass/branches/develbranch_6/swig/python/interfaces/imagedefs.i	2008-09-14 05:48:46 UTC (rev 33439)
+++ grass/branches/develbranch_6/swig/python/interfaces/imagedefs.i	2008-09-14 06:59:56 UTC (rev 33440)
@@ -118,52 +118,3 @@
 /* var.c */
 double I_variance(double, double, int);
 double I_stddev(double, double, int);
-
-/* c_assign.c */
-int I_cluster_assign(struct Cluster *, int *);
-
-/* c_begin.c */
-int I_cluster_begin(struct Cluster *, int);
-
-/* c_clear.c */
-int I_cluster_clear(struct Cluster *);
-
-/* c_distinct.c */
-int I_cluster_distinct(struct Cluster *, double);
-
-/* c_exec.c */
-int I_cluster_exec(struct Cluster *, int, int, double, double, int, int (*)(),
-		   int *);
-/* c_execmem.c */
-int I_cluster_exec_allocate(struct Cluster *);
-int I_cluster_exec_free(struct Cluster *);
-
-/* c_means.c */
-int I_cluster_means(struct Cluster *);
-
-/* c_merge.c */
-int I_cluster_merge(struct Cluster *);
-
-/* c_nclasses.c */
-int I_cluster_nclasses(struct Cluster *, int);
-
-/* c_point.c */
-int I_cluster_point(struct Cluster *, CELL *);
-int I_cluster_begin_point_set(struct Cluster *, int);
-int I_cluster_point_part(struct Cluster *, register CELL, int, int);
-int I_cluster_end_point_set(struct Cluster *, int);
-
-/* c_reassign.c */
-int I_cluster_reassign(struct Cluster *, int *);
-
-/* c_reclass.c */
-int I_cluster_reclass(struct Cluster *, int);
-
-/* c_sep.c */
-double I_cluster_separation(struct Cluster *, int, int);
-
-/* c_sig.c */
-int I_cluster_signatures(struct Cluster *);
-
-/* c_sum2.c */
-int I_cluster_sum2(struct Cluster *);

Modified: grass/branches/develbranch_6/swig/python/interfaces/imagery.i
===================================================================
--- grass/branches/develbranch_6/swig/python/interfaces/imagery.i	2008-09-14 05:48:46 UTC (rev 33439)
+++ grass/branches/develbranch_6/swig/python/interfaces/imagery.i	2008-09-14 06:59:56 UTC (rev 33440)
@@ -1,3 +1,5 @@
+#include <grass/cluster.h>
+
 #define INAME_LEN 30
 struct Ref_Files
 {
@@ -56,31 +58,6 @@
 
 };
 
-struct Cluster
-{
-    int nbands;
-    int npoints;
-    CELL **points;
-    int np;
-
-    double *band_sum;
-    double *band_sum2;
-
-    int *class;
-    int *reclass;
-    int *count;
-    int *countdiff;
-    double **sum;
-    double **sumdiff;
-    double **sum2;
-    double **mean;
-    struct Signature S;
-
-    int nclasses;
-    int merge1, merge2;
-    int iteration;
-    double percent_stable;
-};
 struct SubSig
 {
     double N;