metis int chosen based on HighsInt

Author: filikat

extern/Metis/Changes.txt

@@ -26,4 +26,6 @@ Changes:
 
 - Any function not needed to call METIS_NodeND has been removed.
 
-- The input matrix (xadj and adjncy) is const.
+- The input matrix (xadj and adjncy) is const.
+
+- The Metis integer type is defined based on HIGHSINT64.

extern/Metis/metis.h

@@ -7,8 +7,8 @@
 \version\verbatim $Id$\endverbatim
 */
 
-#ifndef _METIS_H_
-#define _METIS_H_ 
+#ifndef HIGHS_METIS_ORDERING_H
+#define HIGHS_METIS_ORDERING_H 
 
 /****************************************************************************
 * A set of defines that can be modified by the user
@@ -30,7 +30,11 @@
  GCC does provides these definitions in stdint.h, but it may require some
  modifications on other architectures.
 --------------------------------------------------------------------------*/
-#ifndef IDXTYPEWIDTH
+#include "HConfig.h"
+
+#ifdef HIGHSINT64
+  #define IDXTYPEWIDTH 64
+#else
   #define IDXTYPEWIDTH 32
 #endif
 
@@ -41,9 +45,7 @@
    32 : single precision floating point (float)
    64 : double precision floating point (double)
 --------------------------------------------------------------------------*/
-#ifndef REALTYPEWIDTH
-  #define REALTYPEWIDTH 32
-#endif
+#define REALTYPEWIDTH 32
 
 /****************************************************************************
 * In principle, nothing needs to be changed beyond this point, unless the

highs/ipm/hipo/factorhighs/Analyse.cpp

@@ -9,18 +9,11 @@
 #include "AMD/amd.h"
 #include "DataCollector.h"
 #include "FactorHiGHSSettings.h"
+#include "Metis/metis.h"
 #include "ReturnValues.h"
 #include "ipm/hipo/auxiliary/Auxiliary.h"
 #include "ipm/hipo/auxiliary/Log.h"
 
-// define correct int type for Metis and AMD before header is included
-#ifdef HIGHSINT64
-#define IDXTYPEWIDTH 64
-#else
-#define IDXTYPEWIDTH 32
-#endif
-#include "Metis/metis.h"
-
 namespace hipo {
 
 const Int64 int32_limit = std::numeric_limits<int32_t>::max();