update to build in codes-net repo

codes/model-net.h

@@ -8,7 +8,7 @@
 #define MODELNET_H
 
 #include "ross.h"
-#include "lp-type-lookup.h"
+#include "codes/lp-type-lookup.h"
 
 typedef struct simplenet_param simplenet_param;
 typedef struct dragonfly_param dragonfly_param;

src/models/networks/model-net/model-net-method.h

+/*
+ * Copyright (C) 2013, University of Chicago
+ *
+ * See COPYRIGHT notice in top-level directory.
+ */
+
+#ifndef MODELNET_METHOD_H
+#define MODELNET_METHOD_H
+
+#include <ross.h>
+
+struct model_net_method
+{
+    char* method_name;  /* example: "dragonfly" */
+    int packet_size; /* packet size */
+    void (*mn_setup)(const void* net_params); /* For initializing the network */
+    void (*model_net_method_packet_event)(
+        char* category, 
+        tw_lpid final_dest_lp, 
+        int packet_size, 
+        int remote_event_size,  /* 0 means don't deliver remote event */
+        const void* remote_event,
+        int self_event_size,    /* 0 means don't deliver self event */
+        const void* self_event,
+        tw_lp *sender,
+	int is_last_pckt);
+    void (*model_net_method_packet_event_rc)(tw_lp *sender);
+    const tw_lptype* (*mn_get_lp_type)();
+    int (*mn_get_msg_sz)();
+};
+
+#endif /* MODELNET_METHOD_H */
+
+/*
+ * Local variables:
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ * End:
+ *
+ * vim: ft=c ts=8 sts=4 sw=4 expandtab
+ */

src/models/networks/model-net/model-net.c

@@ -6,7 +6,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "model-net.h"
+#include "codes/model-net.h"
 #include "model-net-method.h"
 
 #define STR_SIZE 16

src/models/networks/model-net/simplenet-upd.c

@@ -8,12 +8,12 @@
 #include <assert.h>
 #include <ross.h>
 
-#include "lp-io.h"
-#include "jenkins-hash.h"
+#include "codes/lp-io.h"
+#include "codes/jenkins-hash.h"
 #include "model-net-method.h"
-#include "model-net.h"
-#include "codes_mapping.h"
-#include "codes.h"
+#include "codes/model-net.h"
+#include "codes/codes_mapping.h"
+#include "codes/codes.h"
 
 #define CATEGORY_NAME_MAX 16
 #define CATEGORY_MAX 12