Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrading lein dependencies #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrading lein dependencies #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(defproject vijual "0.1.0-SNAPSHOT"
:description "A Graph Layout Library For Clojure"
:dependencies [[org.clojure/clojure "1.1.0-alpha-SNAPSHOT"]
[org.clojure/clojure-contrib "1.0-SNAPSHOT"]]
:dependencies [[org.clojure/clojure "1.8.0"]
[org.clojure/math.numeric-tower "0.0.4"]]
:dev-dependencies [[lein-clojars "0.5.0-SNAPSHOT"]
[leiningen/lein-swank "1.1.0"]]
:repositories [["clojars" "http://clojars.org/repo"]])
35 changes: 24 additions & 11 deletions src/vijual.clj → src/vijual/core.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
(ns vijual
(:use clojure.contrib.math)
(:use clojure.contrib.seq-utils)
(:import (java.io File)
(javax.imageio ImageIO)
(java.awt Color)
(java.awt.image BufferedImage)))
(ns vijual.core
(:require [clojure.math.numeric-tower :refer [floor abs ceil]])
(:import [java.io File]
[javax.imageio ImageIO]
[java.awt Color]
[java.awt.image BufferedImage]))

;;Maintained By Conrad Barski- Licensed under GPLV3

;; Common functions to all layout algorithms

(defn positions
"Returns a lazy sequence containing the positions at which pred
is true for items in coll."
[pred coll]
(map first (filter (comp pred second)
(map-indexed vector coll))))

(defn half [x]
(/ x 2))

Expand Down Expand Up @@ -488,8 +494,8 @@
(defn shuffle-nodes
"Randomly swaps two nodes of the graph"
[pos nodes]
(let [a (rand-elt nodes)
b (rand-elt nodes)
(let [a (rand-nth nodes)
b (rand-nth nodes)
an (pos a)
bn (pos b)]
(merge pos
Expand Down Expand Up @@ -751,7 +757,11 @@
nodes))))

(defn fix-leg-directions
"This function should be obsolete in the near future. It checks all lines making up the edges to make sure they are marked with the correct direction (up, down, left, right). In the future, the lines will instead be marked as 'horizontal' and 'vertical' instead, which will prevent any 'flips' in direction from happening."
"This function should be obsolete in the near future. It checks all lines
making up the edges to make sure they are marked with the correct direction
(up, down, left, right). In the future, the lines will instead be marked as
'horizontal' and 'vertical' instead, which will prevent any 'flips' in
direction from happening."
[nodes]
(into {}
(map (fn [[key {:keys [links] :as node}]]
Expand Down Expand Up @@ -780,7 +790,10 @@
nodes)))

(defn vcompact
"This function is a monster and will probably be broken into smaller functions in the future. Its job is to pack the graph by pushing all nodes and lines upwards as much as possible. It also 'feathers out' all edges attaching to the same side of a single node, so that you can see separate attachment points for each."
"This function is a monster and will probably be broken into smaller functions in the future.
Its job is to pack the graph by pushing all nodes and lines upwards as much as possible.
It also 'feathers out' all edges attaching to the same side of a single node, so that you can
see separate attachment points for each."
[{:keys [line-padding line-wid]} nodes]
(let [side (get-side nodes)
positions (pos-map nodes)
Expand Down