Commit c5f3b13a authored by Kai Zhang's avatar Kai Zhang

remove Layout

parent c3b93097
#include <igraph/igraph.h>
#include "haskell_attributes.h" #include "haskell_attributes.h"
const igraph_attribute_table_t igraph_haskell_attribute_table={ const igraph_attribute_table_t igraph_haskell_attribute_table={
......
cabal-version: 2.2 cabal-version: 2.2
name: haskell-igraph name: haskell-igraph
version: 0.8.0.0 version: 0.8.0
synopsis: Bindings to the igraph C library. synopsis: Bindings to the igraph C library (v0.8.0).
description: igraph<"http://igraph.org/c/"> is a library for creating description: igraph<"http://igraph.org/c/"> is a library for creating
and manipulating large graphs. This package provides the Haskell and manipulating large graphs. This package provides the Haskell
interface of igraph. interface of igraph.
...@@ -28,10 +28,6 @@ extra-source-files: ...@@ -28,10 +28,6 @@ extra-source-files:
README.md README.md
ChangeLog.md ChangeLog.md
Flag graphics
Description: Enable graphics output
Default: False
library library
exposed-modules: exposed-modules:
IGraph.Internal.Initialization IGraph.Internal.Initialization
...@@ -45,7 +41,7 @@ library ...@@ -45,7 +41,7 @@ library
IGraph.Algorithms.Structure IGraph.Algorithms.Structure
IGraph.Algorithms.Community IGraph.Algorithms.Community
IGraph.Algorithms.Clique IGraph.Algorithms.Clique
IGraph.Algorithms.Layout --IGraph.Algorithms.Layout
IGraph.Algorithms.Motif IGraph.Algorithms.Motif
IGraph.Algorithms.Generators IGraph.Algorithms.Generators
IGraph.Algorithms.Isomorphism IGraph.Algorithms.Isomorphism
...@@ -62,7 +58,6 @@ library ...@@ -62,7 +58,6 @@ library
, containers , containers
, data-ordlist , data-ordlist
, primitive , primitive
, split
, singletons , singletons
extra-libraries: stdc++ extra-libraries: stdc++
......
...@@ -11,10 +11,8 @@ ...@@ -11,10 +11,8 @@
#define HAVE_RINTF 1 #define HAVE_RINTF 1
#define HAVE_ROUND 1 #define HAVE_ROUND 1
#define HAVE_SNPRINTF 1 #define HAVE_SNPRINTF 1
#undef HAVE_ISFINITE
/* libraries */ /* libraries */
#define HAVE_GMP 1
#define HAVE_MEMORY_H 1 #define HAVE_MEMORY_H 1
#define HAVE_STDINT_H 1 #define HAVE_STDINT_H 1
#define HAVE_STRINGS_H 1 #define HAVE_STRINGS_H 1
...@@ -38,5 +36,4 @@ ...@@ -38,5 +36,4 @@
#define PACKAGE_URL "" #define PACKAGE_URL ""
#define PACKAGE_VERSION "0.8.0" #define PACKAGE_VERSION "0.8.0"
#define STDC_HEADERS 1 #define STDC_HEADERS 1
#define VERSION "0.8.0" #define VERSION "0.8.0"
#undef YYTEXT_POINTER \ No newline at end of file
#ifndef HASKELL_IGRAPH_BYTESTRING #ifndef HASKELL_IGRAPH_BYTESTRING
#define HASKELL_IGRAPH_BYTESTRING #define HASKELL_IGRAPH_BYTESTRING
#include <igraph/igraph.h> #include "igraph.h"
typedef struct bytestring_t { typedef struct bytestring_t {
unsigned long int len; unsigned long int len;
......
#ifndef HASKELL_IGRAPH_ATTRIBUTE #ifndef HASKELL_IGRAPH_ATTRIBUTE
#define HASKELL_IGRAPH_ATTRIBUTE #define HASKELL_IGRAPH_ATTRIBUTE
#include "igraph/igraph.h" #include "igraph.h"
#include "bytestring.h" #include "bytestring.h"
#include <string.h> #include <string.h>
......
#ifndef HASKELL_IGRAPH #ifndef HASKELL_IGRAPH
#define HASKELL_IGRAPH #define HASKELL_IGRAPH
#include <igraph/igraph.h> #include "igraph.h"
void haskelligraph_init(); void haskelligraph_init();
......
...@@ -2,7 +2,7 @@ module IGraph.Algorithms ...@@ -2,7 +2,7 @@ module IGraph.Algorithms
( module IGraph.Algorithms.Structure ( module IGraph.Algorithms.Structure
, module IGraph.Algorithms.Community , module IGraph.Algorithms.Community
, module IGraph.Algorithms.Clique , module IGraph.Algorithms.Clique
, module IGraph.Algorithms.Layout -- , module IGraph.Algorithms.Layout
, module IGraph.Algorithms.Motif , module IGraph.Algorithms.Motif
, module IGraph.Algorithms.Generators , module IGraph.Algorithms.Generators
, module IGraph.Algorithms.Isomorphism , module IGraph.Algorithms.Isomorphism
...@@ -12,7 +12,7 @@ module IGraph.Algorithms ...@@ -12,7 +12,7 @@ module IGraph.Algorithms
import IGraph.Algorithms.Structure import IGraph.Algorithms.Structure
import IGraph.Algorithms.Community import IGraph.Algorithms.Community
import IGraph.Algorithms.Clique import IGraph.Algorithms.Clique
import IGraph.Algorithms.Layout --import IGraph.Algorithms.Layout
import IGraph.Algorithms.Motif import IGraph.Algorithms.Motif
import IGraph.Algorithms.Generators import IGraph.Algorithms.Generators
import IGraph.Algorithms.Isomorphism import IGraph.Algorithms.Isomorphism
......
...@@ -14,7 +14,7 @@ import Foreign ...@@ -14,7 +14,7 @@ import Foreign
import IGraph import IGraph
{#import IGraph.Internal #} {#import IGraph.Internal #}
#include "igraph/igraph.h" #include "haskell_igraph.h"
data LayoutMethod = data LayoutMethod =
KamadaKawai { kk_seed :: !(Maybe [(Double, Double)]) KamadaKawai { kk_seed :: !(Maybe [(Double, Double)])
......
...@@ -132,7 +132,6 @@ import Data.List (transpose) ...@@ -132,7 +132,6 @@ import Data.List (transpose)
import qualified Data.Map.Strict as M import qualified Data.Map.Strict as M
import System.IO.Unsafe (unsafePerformIO) import System.IO.Unsafe (unsafePerformIO)
import Data.Either (fromRight) import Data.Either (fromRight)
import Data.List.Split (chunksOf)
import Data.Serialize (Serialize, decode, encode) import Data.Serialize (Serialize, decode, encode)
import Control.Monad.Primitive import Control.Monad.Primitive
import Control.Exception (bracket_) import Control.Exception (bracket_)
...@@ -348,6 +347,9 @@ toColumnLists mptr = do ...@@ -348,6 +347,9 @@ toColumnLists mptr = do
igraphMatrixCopyTo mptr ptr igraphMatrixCopyTo mptr ptr
peekArray (r*c) ptr peekArray (r*c) ptr
return $ chunksOf r $ map realToFrac xs return $ chunksOf r $ map realToFrac xs
where
chunksOf _ [] = []
chunksOf i ls = take i ls : chunksOf i (drop i ls)
{#fun igraph_matrix_null as ^ { castPtr `Ptr Matrix' } -> `()' #} {#fun igraph_matrix_null as ^ { castPtr `Ptr Matrix' } -> `()' #}
......
{-# LANGUAGE ForeignFunctionInterface #-} {-# LANGUAGE ForeignFunctionInterface #-}
module IGraph.Internal.Constants where module IGraph.Internal.Constants where
#include "igraph/igraph.h" #include "haskell_igraph.h"
{#enum igraph_neimode_t as Neimode {underscoreToCase} {#enum igraph_neimode_t as Neimode {underscoreToCase}
deriving (Show, Eq) #} deriving (Show, Eq) #}
......
flags:
haskell-igraph:
graphics: false
packages: packages:
- '.' - '.'
......
...@@ -19,7 +19,6 @@ cat <<EOT > include/config.h ...@@ -19,7 +19,6 @@ cat <<EOT > include/config.h
#undef HAVE_ISFINITE #undef HAVE_ISFINITE
/* libraries */ /* libraries */
#define HAVE_GMP 1
#define HAVE_MEMORY_H 1 #define HAVE_MEMORY_H 1
#define HAVE_STDINT_H 1 #define HAVE_STDINT_H 1
#define HAVE_STRINGS_H 1 #define HAVE_STRINGS_H 1
...@@ -94,4 +93,5 @@ ls -d1 $2/src/*.cc ...@@ -94,4 +93,5 @@ ls -d1 $2/src/*.cc
#define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_TYPES_H 1
#define HAVE_TIMES_H 1 #define HAVE_TIMES_H 1
#define HAVE_TIME_H 1 #define HAVE_TIME_H 1
#define HAVE_UNISTD_H 1 #define HAVE_UNISTD_H 1
\ No newline at end of file #define HAVE_GMP 1
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment