wip, builds, before glpk

diff --git a/Makefile b/Makefile
index af97bd23fabf36eb663bba7b52b9ad18e655361d..fa230a6cf45013c8b9a2721b11fde123b066ebb1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 CFLAGS += -Wall -Wwrite-strings -Wstrict-prototypes
 LC_CTYPE=C
 CFLAGS += -Wall -Wwrite-strings -Wstrict-prototypes
 LC_CTYPE=C

+LDLIBS = -lpub

 
 all: main
 
 all: main

diff --git a/main.c b/main.c
index 0c694c8f122aa653a07e64774649068145cc7be8..fa5c7db207613ffc2ca3eb3fd4f8b79a07e4f688 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,25 +1,34 @@
 
 

+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <inttypes.h>
+
+#include <publib.h>
+

 typedef uint32_t AdjWord;
 typedef uint32_t AdjWord;

-#define PRADJ PRIx32
+#define PRADJ "08"PRIx32

 
 static int n, m;
 
 static int n, m;

-static AdjWord adjmatrix[n];
+static AdjWord *adjmatrix;

 static AdjWord adjall;
 
 static double best;
 static AdjWord adjall;
 
 static double best;

-static AdjWord adjmatrix_best[n];

 
 static void prep(void) {
   adjall = ~((~(AdjWord)0) << m);
 
 static void prep(void) {
   adjall = ~((~(AdjWord)0) << m);

+  adjmatrix = xmalloc(sizeof(*adjmatrix)*n);

 }
 
 static int count_set_adj_bits(AdjWord w) {
 }
 
 static int count_set_adj_bits(AdjWord w) {

-  for (int j=0, total=0; j<m; j++)
+  int j, total;
+  for (j=0, total=0; j<m; j++)

     total += !!(w & ((AdjWord)1 << j));
   return total;
 }
 
 static void optimise(void) {
     total += !!(w & ((AdjWord)1 << j));
   return total;
 }
 
 static void optimise(void) {

+  int i;

   for (i=0; i<n; i++) {
     printf("%"PRADJ" ", adjmatrix[i]);
     double maxminsize = (double)m / count_set_adj_bits(adjmatrix[i]);
   for (i=0; i<n; i++) {
     printf("%"PRADJ" ", adjmatrix[i]);
     double maxminsize = (double)m / count_set_adj_bits(adjmatrix[i]);


@@ -33,7 +42,7 @@ static void optimise(void) {
 }
 
 static void iterate_recurse(int i, AdjWord min) {
 }
 
 static void iterate_recurse(int i, AdjWord min) {

-  if (i > n) {
+  if (i >= n) {

     optimise();
     return;
   }
     optimise();
     return;
   }


@@ -41,6 +50,8 @@ static void iterate_recurse(int i, AdjWord min) {
        ;
        adjmatrix[i]++) {
     iterate_recurse(i+1, adjmatrix[i]);
        ;
        adjmatrix[i]++) {
     iterate_recurse(i+1, adjmatrix[i]);

+    if (adjmatrix[i] == adjall)
+      return;

   }
 }
 
   }
 }