summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes')
-rw-r--r--Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForceAbsoluteValue.lua28
-rw-r--r--Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForceCanvasDistance.lua36
-rw-r--r--Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForceCanvasPosition.lua26
-rw-r--r--Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForceGraphDistance.lua42
-rw-r--r--Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForcePullToGrid.lua36
-rw-r--r--Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForcePullToPoint.lua40
6 files changed, 104 insertions, 104 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForceAbsoluteValue.lua b/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForceAbsoluteValue.lua
index 774743e52e6..4634b701235 100644
--- a/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForceAbsoluteValue.lua
+++ b/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForceAbsoluteValue.lua
@@ -7,9 +7,9 @@
--
-- See the file doc/generic/pgf/licenses/LICENSE for more information
---- This is a subclass of ForceTemplate, which is used to implement forces
--- that work on individual vertices. Forces of this kind simply add an
--- absolute value set in the force data to each vertex' $x$ and $y$ coodinate
+--- This is a subclass of ForceTemplate, which is used to implement forces
+-- that work on individual vertices. Forces of this kind simply add an
+-- absolute value set in the force data to each vertex' $x$ and $y$ coordinate
-- Imports
local ForceTemplate = require "pgf.gd.force.jedi.base.ForceTemplate"
@@ -31,11 +31,11 @@ function ForceAbsoluteValue:constructor ()
end
--- This force class works on a vertex array that is part of the force data
--- defined when adding the force. This array is copied into p. All vertices of
--- the graph are saved in the local variable |ver|.
+-- This force class works on a vertex array that is part of the force data
+-- defined when adding the force. This array is copied into p. All vertices of
+-- the graph are saved in the local variable |ver|.
--
--- @param v The vertices of the graph we are trying to find a layout for.
+-- @param v The vertices of the graph we are trying to find a layout for.
function ForceAbsoluteValue:preprocess(v)
self.ver = v
@@ -43,12 +43,12 @@ function ForceAbsoluteValue:preprocess(v)
end
--- Applying the force to the vertices and adding the effect to the passed net
+-- Applying the force to the vertices and adding the effect to the passed net
-- force array
---
--- @param data The parameters needed to aplly the force: The options table,
--- the current time stamp, an array containing the summed up net
--- forces
+--
+-- @param data The parameters needed to apply the force: The options table,
+-- the current time stamp, an array containing the summed up net
+-- forces
function ForceAbsoluteValue:applyTo(data)
-- locals for speed
@@ -61,13 +61,13 @@ function ForceAbsoluteValue:applyTo(data)
local time_fun = self.force.time_fun
-- Evaluate time function
- local time_factor = time_fun(t_max, t_now)
+ local time_factor = time_fun(t_max, t_now)
if time_factor == 0 then
return
end
for _,v in ipairs(self.ver) do
- for _, i in ipairs (self.p) do
+ for _, i in ipairs (self.p) do
-- Is the vertex in the list?
if v.name == i then
diff --git a/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForceCanvasDistance.lua b/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForceCanvasDistance.lua
index 6d9e69745ed..8cea1aec6a8 100644
--- a/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForceCanvasDistance.lua
+++ b/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForceCanvasDistance.lua
@@ -8,9 +8,9 @@
-- See the file doc/generic/pgf/licenses/LICENSE for more information
---- This is a subclass of ForceTemplate, which is used to implement forces between
--- vertex pairs. The forces depend on the canvas distance of the vertices in
--- the pair. This class is e.~g.~ used for electric forces.
+--- This is a subclass of ForceTemplate, which is used to implement forces between
+-- vertex pairs. The forces depend on the canvas distance of the vertices in
+-- the pair. This class is e.~g.~ used for electric forces.
-- Imports
local ForceTemplate = require "pgf.gd.force.jedi.base.ForceTemplate"
@@ -22,7 +22,7 @@ local max = math.max
local sqrt = math.sqrt
local min = math.min
--- Implementation starts here:
+-- Implementation starts here:
local ForceCanvasDistance = lib.class { base_class = ForceTemplate }
function ForceCanvasDistance:constructor ()
@@ -31,24 +31,24 @@ function ForceCanvasDistance:constructor ()
end
--- This force class works on all pairwise disjoint vertex pairs. This
--- function generates a new graph object containing all vertices from the
--- original graph and arcs between all pairwise disjoint vertex pairs. The
--- arcs-table of this new object will be saved in the variable |p|.
---
--- @param v The vertices of the graph we are trying to find a layout for.
+-- This force class works on all pairwise disjoint vertex pairs. This
+-- function generates a new graph object containing all vertices from the
+-- original graph and arcs between all pairwise disjoint vertex pairs. The
+-- arcs-table of this new object will be saved in the variable |p|.
+--
+-- @param v The vertices of the graph we are trying to find a layout for.
function ForceCanvasDistance:preprocess(v)
self.p = Preprocessing.allPairs(v)
end
--- Applying the force to the vertices and adding the effect to the passed net
+-- Applying the force to the vertices and adding the effect to the passed net
-- force array
---
--- @param data The parameters needed to aplly the force: The options table,
--- the current time stamp, an array containing the summed up net
--- forces
+--
+-- @param data The parameters needed to apply the force: The options table,
+-- the current time stamp, an array containing the summed up net
+-- forces
function ForceCanvasDistance:applyTo(data)
-- locals for speed
@@ -68,7 +68,7 @@ function ForceCanvasDistance:applyTo(data)
if time_factor == 0 then
return
end
-
+
if not fun_v then
local data = { k = k, attributes = fw_attributes }
for _, i in ipairs(p) do
@@ -103,7 +103,7 @@ function ForceCanvasDistance:applyTo(data)
else
x = min(cap, g)
end
-
+
if h <= 0 then
y = max(-cap, h)
else
@@ -168,7 +168,7 @@ function ForceCanvasDistance:applyTo(data)
else
x_tail = min(cap, g_tail)
end
-
+
if h_head <= 0 then
y_head = max(-cap, h_head)
else
diff --git a/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForceCanvasPosition.lua b/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForceCanvasPosition.lua
index 377ab22c348..41edaba3588 100644
--- a/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForceCanvasPosition.lua
+++ b/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForceCanvasPosition.lua
@@ -8,9 +8,9 @@
-- See the file doc/generic/pgf/licenses/LICENSE for more information
---- This is a subclass of ForceTemplate, which is used to implement forces
--- that work on individual vertices. The forces depend on the canvas position
--- of the vertices. This class is e.~g.~ used for gravitational forces.
+--- This is a subclass of ForceTemplate, which is used to implement forces
+-- that work on individual vertices. The forces depend on the canvas position
+-- of the vertices. This class is e.~g.~ used for gravitational forces.
local ForceTemplate = require "pgf.gd.force.jedi.base.ForceTemplate"
local lib = require "pgf.gd.lib"
@@ -30,23 +30,23 @@ function ForceCanvasPosition:constructor ()
end
--- This force class works on individual vertices and only depends on their
--- current position. Thus the vertex table of the current graph is simply
--- copied to the variable |p|.
---
--- @param v The vertices of the graph we are trying to find a layout for.
+-- This force class works on individual vertices and only depends on their
+-- current position. Thus the vertex table of the current graph is simply
+-- copied to the variable |p|.
+--
+-- @param v The vertices of the graph we are trying to find a layout for.
function ForceCanvasPosition:preprocess(v)
self.p = v
end
--- Applying the force to the vertices and adding the effect to the passed net
+-- Applying the force to the vertices and adding the effect to the passed net
-- force array
---
--- @param data The parameters needed to aplly the force: The options table,
--- the current time stamp, an array containing the summed up net
--- forces
+--
+-- @param data The parameters needed to apply the force: The options table,
+-- the current time stamp, an array containing the summed up net
+-- forces
function ForceCanvasPosition:applyTo(data)
--localize
diff --git a/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForceGraphDistance.lua b/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForceGraphDistance.lua
index 628f1192ac0..86d67f2678f 100644
--- a/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForceGraphDistance.lua
+++ b/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForceGraphDistance.lua
@@ -8,9 +8,9 @@
-- See the file doc/generic/pgf/licenses/LICENSE for more information
---- This is a subclass of ForceTemplate, which is used to implement forces between
--- vertex pairs. The forces depend on the graph distance of the vertices in
--- the pair. This class is e.~g.~ used for spring forces.
+--- This is a subclass of ForceTemplate, which is used to implement forces between
+-- vertex pairs. The forces depend on the graph distance of the vertices in
+-- the pair. This class is e.\,g.\ used for spring forces.
local ForceTemplate = require "pgf.gd.force.jedi.base.ForceTemplate"
@@ -32,26 +32,26 @@ function ForceGraphDistance:constructor ()
end
--- This force class works on all pairwise disjoint vertex pairs connected by
--- a path of length maximum $n$. The parameter $n$ is given by the engineer in
--- the force declaration. This function generates a new graph object
--- containing all vertices from the original graph and arcs between all
--- pairwise disjoint vertex pairs. The arcs-table of this new object will be
--- saved in the variable |p|.
---
--- @param v The vertices of the graph we are trying to find a layout for.
+-- This force class works on all pairwise disjoint vertex pairs connected by
+-- a path of length maximum $n$. The parameter $n$ is given by the engineer in
+-- the force declaration. This function generates a new graph object
+-- containing all vertices from the original graph and arcs between all
+-- pairwise disjoint vertex pairs. The arcs-table of this new object will be
+-- saved in the variable |p|.
+--
+-- @param v The vertices of the graph we are trying to find a layout for.
function ForceGraphDistance:preprocess(v, a)
self.p = Preprocessing.overExactlyNPairs(v, a, self.force.n)
end
--- Applying the force to the vertices andadding the effect to the passed net
+-- Applying the force to the vertices and adding the effect to the passed net
-- force array
---
--- @param data The parameters needed to aplly the force: The options table,
--- the current time stamp, an array containing the summed up net
--- forces
+--
+-- @param data The parameters needed to apply the force: The options table,
+-- the current time stamp, an array containing the summed up net
+-- forces
function ForceGraphDistance:applyTo(data)
-- locals for speed
@@ -86,12 +86,12 @@ function ForceGraphDistance:applyTo(data)
local y = p2_pos.y - p1_pos.y
local d = max(sqrt(x*x+y*y),0.1)
- -- apply force function to distance and k (natural spring length)
+ -- apply force function to distance and k (natural spring length)
data.u = p2
data.v = p1
data.d = d
local e = fun_u(data)
-
+
-- Include time function
local f = e * time_factor / d
@@ -106,7 +106,7 @@ function ForceGraphDistance:applyTo(data)
else
x = min(cap, g)
end
-
+
if g <= 0 then
y = max(-cap, h)
else
@@ -147,7 +147,7 @@ function ForceGraphDistance:applyTo(data)
data.d = d
local e_head = fun_u(data)
local e_tail = fun_v(data)
-
+
-- Include time function
local f_head = time_factor * e_head / d
local f_tail = time_factor * e_tail / d
@@ -172,7 +172,7 @@ function ForceGraphDistance:applyTo(data)
else
x_tail = min(cap, g_tail)
end
-
+
if h_head <= 0 then
y_head = max(-cap, h_head)
else
diff --git a/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForcePullToGrid.lua b/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForcePullToGrid.lua
index b196a8a6a95..5f53f5da784 100644
--- a/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForcePullToGrid.lua
+++ b/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForcePullToGrid.lua
@@ -8,12 +8,12 @@
-- See the file doc/generic/pgf/licenses/LICENSE for more information
---- This is a subclass of ForceTemplate, which is used to implement forces
--- that work on individual vertices and pulls them to a virtual grid with
--- cells of the size determined by the user options |grid x length| and
--- |grid y length|. The forces depend on the canvas position
--- of the vertices relative to th next grid point. This class is e.~g.~ used
--- for the post-processing technique |snap to grid|.
+--- This is a subclass of ForceTemplate, which is used to implement forces
+-- that work on individual vertices and pulls them to a virtual grid with
+-- cells of the size determined by the user options |grid x length| and
+-- |grid y length|. The forces depend on the canvas position
+-- of the vertices relative to th next grid point. This class is e.\,g.\ used
+-- for the post-processing technique |snap to grid|.
-- Imports
@@ -40,22 +40,22 @@ function ForcePullToGrid:constructor ()
self.p = {}
end
--- This force class works on individual vertices and only depends on their
--- current position. Thus the vertex table of the current graph is simply
--- copied to the variable |p|.
---
--- @param v The vertices of the graph we are trying to find a layout for.
+-- This force class works on individual vertices and only depends on their
+-- current position. Thus the vertex table of the current graph is simply
+-- copied to the variable |p|.
+--
+-- @param v The vertices of the graph we are trying to find a layout for.
function ForcePullToGrid:preprocess(v)
self.p = v
end
--- Applying the force to the vertices andadding the effect to the passed net
+-- Applying the force to the vertices and adding the effect to the passed net
-- force array
---
--- @param data The parameters needed to aplly the force: The options table,
--- the current time stamp, an array containing the summed up net
+--
+-- @param data The parameters needed to apply the force: The options table,
+-- the current time stamp, an array containing the summed up net
-- forces
function ForcePullToGrid:applyTo(data)
@@ -71,7 +71,7 @@ function ForcePullToGrid:applyTo(data)
local length = 5--self.options["node distance"]
-- Evaluate time function
- local time_factor = time_fun(t_max, t_now)
+ local time_factor = time_fun(t_max, t_now)
if time_factor == 0 then
return
end
@@ -89,7 +89,7 @@ function ForcePullToGrid:applyTo(data)
local l = -d/(length*length)
-- Include time function
- local h = l * time_factor
+ local h = l * time_factor
-- scale effect according to direction
local f = x * h
@@ -102,7 +102,7 @@ function ForcePullToGrid:applyTo(data)
else
x = min(cap, f)
end
-
+
if g <= 0 then
y = max(-cap, g)
else
diff --git a/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForcePullToPoint.lua b/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForcePullToPoint.lua
index 908fdcf6b2e..985b8eec2e5 100644
--- a/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForcePullToPoint.lua
+++ b/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/forcetypes/ForcePullToPoint.lua
@@ -7,11 +7,11 @@
--
-- See the file doc/generic/pgf/licenses/LICENSE for more information
---- This is a subclass of ForceTemplate, which is used to implement forces
--- that work on individual vertices and pulls them to a specific point on the
--- canvas. This point is given by the |desired at| option. The forces depend
--- on the canvas position of the vertices relative to the canvas point it is
--- pulled to.
+--- This is a subclass of ForceTemplate, which is used to implement forces
+-- that work on individual vertices and pulls them to a specific point on the
+-- canvas. This point is given by the |desired at| option. The forces depend
+-- on the canvas position of the vertices relative to the canvas point it is
+-- pulled to.
-- Imports
@@ -33,17 +33,17 @@ function ForcePullToPoint:constructor ()
self.p = {}
end
--- This force class works on individual vertices and depends on their
--- current position as well as the point it is desired at. Thus all vertices
--- where the |desired at| option is set are added to the table |p| together
--- with the point where they are wanted.
---
--- @param v The vertices of the graph we are trying to find a layout for.
+-- This force class works on individual vertices and depends on their
+-- current position as well as the point it is desired at. Thus all vertices
+-- where the |desired at| option is set are added to the table |p| together
+-- with the point where they are wanted.
+--
+-- @param v The vertices of the graph we are trying to find a layout for.
function ForcePullToPoint:preprocess(v)
for _,vertex in ipairs(v) do
if vertex.options then
- local da = vertex.options["desired at"]
+ local da = vertex.options["desired at"]
if da then
self.p[vertex]= {da}
end
@@ -52,12 +52,12 @@ function ForcePullToPoint:preprocess(v)
end
--- Applying the force to the vertices andadding the effect to the passed net
+-- Applying the force to the vertices and adding the effect to the passed net
-- force array
---
--- @param data The parameters needed to aplly the force: The options table,
--- the current time stamp, an array containing the summed up net
--- forces
+--
+-- @param data The parameters needed to apply the force: The options table,
+-- the current time stamp, an array containing the summed up net
+-- forces
function ForcePullToPoint:applyTo(data)
-- locals for speed
@@ -69,7 +69,7 @@ function ForcePullToPoint:applyTo(data)
local time_fun = self.force.time_fun
-- Evaluate time function
- local time_factor = time_fun(t_max, t_now)
+ local time_factor = time_fun(t_max, t_now)
if time_factor == 0 then
return
end
@@ -85,7 +85,7 @@ function ForcePullToPoint:applyTo(data)
local d = max(sqrt(x*x+y*y),0.1)
-- Include time function
- local h = d * time_factor
+ local h = d * time_factor
-- scale effect according to direction
local f = x * h
@@ -98,7 +98,7 @@ function ForcePullToPoint:applyTo(data)
else
x = min(cap, f)
end
-
+
if g <= 0 then
y = max(-cap, g)
else