Skip to content

Commit

Permalink
Fixes for last commit. Bumped to version 0.2.4.
Browse files Browse the repository at this point in the history
  • Loading branch information
@joshuaeckroth
joshuaeckroth committed Mar 28, 2013
1 parent d5817b5 commit a39d017
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 42 deletions.
70 changes: 44 additions & 26 deletions pom.xml
View file
@@ -1,50 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>vijual</groupId>
<groupId>cc.artifice</groupId>
<artifactId>vijual</artifactId>
<version>0.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<version>0.2.3</version>
<name>vijual</name>
<description>A Graph Layout Library For Clojure</description>
<scm>
<connection>scm:git:git://github.com/drcode/vijual.git</connection>
<developerConnection>scm:git:ssh://git@github.com/drcode/vijual.git</developerConnection>
<tag>ba1f9a9a1e5e17b96de264ccf133538c8acf9c33</tag>
<url>http://github.com/drcode/vijual</url>
<connection>scm:git:git://github.com/joshuaeckroth/vijual.git</connection>
<developerConnection>scm:git:ssh://git@github.com/joshuaeckroth/vijual.git</developerConnection>
<tag>d5817b550f03c49530b9485e24e4df1b575f5297</tag>
<url>https://github.com/joshuaeckroth/vijual</url>
</scm>
<build>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
<resources>
<resource>
<directory>resources</directory>
</resource>
</resources>
<testResources>
<testResource>
<directory>dev-resources</directory>
</testResource>
<testResource>
<directory>resources</directory>
</testResource>
</testResources>
<directory>target</directory>
<outputDirectory>target/classes</outputDirectory>
</build>
<repositories>
<repository>
<id>clojars</id>
<url>http://clojars.org/repo</url>
</repository>
<repository>
<id>central</id>
<url>http://repo1.maven.org/maven2</url>
</repository>
<repository>
<id>clojure-snapshots</id>
<url>http://build.clojure.org/snapshots</url>
<url>http://repo1.maven.org/maven2/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</repository>
<repository>
<id>clojars</id>
<url>http://clojars.org/repo/</url>
<url>https://clojars.org/repo/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure</artifactId>
<version>1.1.0-alpha-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure-contrib</artifactId>
<version>1.0-SNAPSHOT</version>
<version>1.4.0</version>
</dependency>
</dependencies>
</project>

<!-- This file was autogenerated by the Leiningen build tool.
<!-- This file was autogenerated by Leiningen.
Please do not edit it directly; instead edit project.clj and regenerate it.
It should not be considered canonical data. For more information see
http://github.com/technomancy/leiningen -->
https://github.com/technomancy/leiningen -->
2 changes: 1 addition & 1 deletion project.clj
View file
@@ -1,3 +1,3 @@
(defproject cc.artifice/vijual "0.2.3"
(defproject cc.artifice/vijual "0.2.4"
:description "A Graph Layout Library For Clojure"
:dependencies [[org.clojure/clojure "1.4.0"]])
40 changes: 25 additions & 15 deletions src/vijual.clj
View file
Expand Up @@ -8,7 +8,16 @@

;; Common functions to all layout algorithms

;; from clojure.contrib.seq
;; from clojure.contrib.seq 1.2
(defn indexed
"Returns a lazy sequence of [index, item] pairs, where items come
from 's' and indexes count up from zero.
(indexed '(a b c d)) => ([0 a] [1 b] [2 c] [3 d])"
[s]
(map vector (iterate inc 0) s))

;; from clojure.contrib.seq 1.2
(defn positions
"Returns a lazy sequence containing the positions at which pred
is true for items in coll."
Expand All @@ -29,9 +38,9 @@
"Takes a sequence of shapes and 'rounds off' all the dimensions so that it can be displayed in ASCII"
[shapes]
(map (fn [{:keys [x y width height type] :as item}]
(let [nu-x (int (floor x))
nu-y (int (floor y))]
(assoc item :x nu-x :y nu-y :width (- (int (floor (+ x width))) nu-x) :height (- (int (floor (+ y height))) nu-y))))
(let [nu-x (int (Math/floor x))
nu-y (int (Math/floor y))]
(assoc item :x nu-x :y nu-y :width (- (int (Math/floor (+ x width))) nu-x) :height (- (int (Math/floor (+ y height))) nu-y))))
shapes))

(defn rect-relation
Expand Down Expand Up @@ -441,8 +450,8 @@
(mapcat (fn [{:keys [legs dest arrow]}]
(let [shapes (map (fn [{x1 :xpos y1 :ypos dir1 :dir} {x2 :xpos y2 :ypos dir2 :dir}]
(if (or (horizontal dir1) (vertical dir2))
{:type :rect :x (min x1 x2) :y (min y1 y2) :width (+ (abs (- x2 x1)) line-wid) :height line-wid}
{:type :rect :x (min x1 x2) :y (min y1 y2) :width line-wid :height (+ (abs (- y2 y1)) line-wid)}))
{:type :rect :x (min x1 x2) :y (min y1 y2) :width (+ (Math/abs (- x2 x1)) line-wid) :height line-wid}
{:type :rect :x (min x1 x2) :y (min y1 y2) :width line-wid :height (+ (Math/abs (- y2 y1)) line-wid)}))
legs
(next legs))
first-leg (first legs)
Expand Down Expand Up @@ -482,19 +491,20 @@
(map (fn [[f t]]
(let [{fx :x fy :y} (pos f)
{tx :x ty :y} (pos t)]
(+ (abs (- fx tx)) (abs (- fy ty)))))
(+ (Math/abs (- fx tx)) (Math/abs (- fy ty)))))
edges)))

(defn get-side
"All graphs currently start as logically square. This function therefore calculates length of side with the sqrt funciton."
[col]
(int (ceil (Math/sqrt (count col)))))
(int (Math/ceil (Math/sqrt (count col)))))

(defn shuffle-nodes
"Randomly swaps two nodes of the graph"
[pos nodes]
(let [a (rand-nth nodes)
b (rand-nth nodes)
;; don't let b = a, since our map (below) will fail by having duplicate keys
b (loop [] (let [b (rand-nth nodes)] (if (= b a) (recur) b)))
an (pos a)
bn (pos b)]
(merge pos
Expand Down Expand Up @@ -535,7 +545,7 @@
(map (fn [[f t]]
(let [{fx :x fy :y} (pos f)
{tx :x ty :y} (pos t)]
(* (+ (abs (- fx tx)) (abs (- fy ty)))
(* (+ (Math/abs (- fx tx)) (Math/abs (- fy ty)))
(cond (> fy ty) 2
(= fy ty) 1
true 1))))
Expand Down Expand Up @@ -850,7 +860,7 @@
nodes (update-in nodes
[key :links]
(fn [links]
(vec (map (fn [{[{:keys [dir ypos]} & {}] :legs :as link}]
(vec (map (fn [{[{:keys [dir ypos]} & _] :legs :as link}]
(assoc-in link
[:legs 0 :ypos]
(cond (horizontal dir) ypos
Expand Down Expand Up @@ -888,7 +898,7 @@
{xpos1 :xpos} (legs leg-index)
{xpos2 :xpos} (legs (inc leg-index))
xpos (min xpos1 xpos2)
width (+ (abs (- xpos2 xpos1)) line-wid)
width (+ (Math/abs (- xpos2 xpos1)) line-wid)
nuy (scan-lowest-y scan xpos width)
f (fn [nodes i]
(assoc-in nodes (concat path [i :ypos]) nuy))]
Expand Down Expand Up @@ -943,7 +953,7 @@
[key (map second items)])
(group-by first
(map (fn [[{xpos1 :xpos ypos :ypos} {xpos2 :xpos}]]
[(int (floor ypos)) [(int (floor (min xpos1 xpos2))) (int (floor (max xpos1 xpos2)))]])
[(int (Math/floor ypos)) [(int (Math/floor (min xpos1 xpos2))) (int (Math/floor (max xpos1 xpos2)))]])
(filter (fn [[{dir :dir} {}]]
(horizontal dir))
(map vector lst (next lst)))))))))
Expand All @@ -954,7 +964,7 @@
(> 2
(count (filter (fn [[xx1 xx2]]
(not (or (<= xx2 x1) (>= xx1 x2))))
(linemap (int (floor y)))))))
(linemap (int (Math/floor y)))))))

(defn remove-zigzags
"Nodes that are adjacent are connected by a 'zigzag' line for most of the algorithms, so that they have some 'give'. This function removes any zigzags for cases where nodes are close enough to be connected by just a straight line."
Expand Down Expand Up @@ -1168,7 +1178,7 @@
(.fillRect graphics (+ x line-wid) (+ y line-wid) (- width (* line-wid 2)) (- height (* line-wid 2)))
(.setColor graphics (Color. 0 0 0))
(doseq [[s n] (map vector (seq text) (iterate inc 0))]
(.drawString graphics s (floor (+ 2 x)) (floor (+ y 8 (* n 10)))))))
(.drawString graphics s (Math/floor (+ 2 x)) (Math/floor (+ y 8 (* n 10)))))))
(doseq [{:keys [type x y width height dir]} shapes]
(when (= type :arrow)
(.setColor graphics (Color. 255 255 255))
Expand Down
6 changes: 6 additions & 0 deletions test/vijual_test.clj
View file
@@ -0,0 +1,6 @@
(ns vijual-test
(:use [clojure.test])
(:use [vijual :reload true]))



0 comments on commit a39d017

Please sign in to comment.