summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/initialpositioning
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-04-08 17:23:59 +0000
committerKarl Berry <karl@freefriends.org>2019-04-08 17:23:59 +0000
commit9da8ac113f97e68e91e3a1ef26467f9814eb4312 (patch)
treef36b76c9a982931638dde95501c51072185dec56 /Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/initialpositioning
parente919fa4b004d0ef401808c337d7def5fa259da0f (diff)
pgf revert to previous release (r49607, committed 5jan19)
git-svn-id: svn://tug.org/texlive/trunk@50867 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/initialpositioning')
-rw-r--r--Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/initialpositioning/CircularInitialPositioning.lua6
-rw-r--r--Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/initialpositioning/GridInitialPositioning.lua6
-rw-r--r--Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/initialpositioning/RandomInitialPositioning.lua10
3 files changed, 11 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/initialpositioning/CircularInitialPositioning.lua b/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/initialpositioning/CircularInitialPositioning.lua
index ab8f1fad9a6..1ed35653c93 100644
--- a/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/initialpositioning/CircularInitialPositioning.lua
+++ b/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/initialpositioning/CircularInitialPositioning.lua
@@ -7,7 +7,7 @@
--
-- See the file doc/generic/pgf/licenses/LICENSE for more information
---- This class implements an initial position algorithm for graph drawing, placing the vertices on
+--- This class implements an inital position algorithm for graph drawing, placing the vertices on
-- a circle with th radius given by the |radius| key
local declare = require "pgf.gd.interface.InterfaceToAlgorithms".declare
local InitialTemplate = require "pgf.gd.force.jedi.base.InitialTemplate"
@@ -21,7 +21,7 @@ declare {
key = "circular initial position",
algorithm = CircularInitialPositioning,
phase = "initial positioning force framework",
- phase_default = true
+ phase_default = true
}
-- Implementation starts here:
@@ -33,7 +33,7 @@ end
function CircularInitialPositioning:run()
-- locals for speed
local vertices = self.vertices
- local tmp = (self.options["node pre sep"] + self.options["node post sep"]) +
+ local tmp = (self.options["node pre sep"] + self.options["node post sep"]) +
(self.options["sibling pre sep"] + self.options["sibling post sep"])
local min_radius = tmp * #self.vertices/2/math.pi
local radius = math.max(self.options.radius, min_radius)
diff --git a/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/initialpositioning/GridInitialPositioning.lua b/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/initialpositioning/GridInitialPositioning.lua
index 2b131e8ad9f..cb710b35d60 100644
--- a/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/initialpositioning/GridInitialPositioning.lua
+++ b/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/initialpositioning/GridInitialPositioning.lua
@@ -7,8 +7,8 @@
--
-- See the file doc/generic/pgf/licenses/LICENSE for more information
---- This class implements an initial position algorithm for graph drawing,
--- placing the vertices on a grid with square cells with width |node distance|
+--- This class implements an inital position algorithm for graph drawing, placing the vertices on
+-- a grid with square cells with width |node distance|
local declare = require "pgf.gd.interface.InterfaceToAlgorithms".declare
local InitialTemplate = require "pgf.gd.force.jedi.base.InitialTemplate"
local lib = require "pgf.gd.lib"
@@ -45,7 +45,7 @@ function GridInitialPositioning:run()
if placed[vertex] == nil then
if i <= (y/dist+1)*n then
x = x + dist
- else
+ else
x = 0
y = y + dist
end
diff --git a/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/initialpositioning/RandomInitialPositioning.lua b/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/initialpositioning/RandomInitialPositioning.lua
index ce3a40582c5..39a58b9e2bd 100644
--- a/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/initialpositioning/RandomInitialPositioning.lua
+++ b/Master/texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/initialpositioning/RandomInitialPositioning.lua
@@ -7,8 +7,8 @@
--
-- See the file doc/generic/pgf/licenses/LICENSE for more information
---- This class implements an initial position algorithm for graph drawing,
--- placing the vertices at random positions.
+--- This class implements an inital position algorithm for graph drawing, placing the vertices at
+-- random positions.
local declare = require "pgf.gd.interface.InterfaceToAlgorithms".declare
local InitialTemplate = require "pgf.gd.force.jedi.base.InitialTemplate"
local lib = require "pgf.gd.lib"
@@ -30,7 +30,7 @@ end
function RandomInitialPositioning:run()
-- locals for speed
- local random = lib.random
+ local random = math.random
local vertices = self.vertices
local desired_vertices = self.desired_vertices
-- place vertices where the |desired at | option has been set first
@@ -39,11 +39,11 @@ function RandomInitialPositioning:run()
for _, vertex in ipairs(vertices) do
-- place all other vertices with respect to the one already placed
if placed[vertex] == nil then
- p = vertex.pos
+ p = vertex.pos
p.x = 100 * random() + centroid_x
p.y = 100 * random() + centroid_y
end
end
end
-return RandomInitialPositioning
+return RandomInitialPositioning \ No newline at end of file