diagrammatron 0.5.1 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f070bf8480ad655c260869aa9854d7553456491c68379403a16b50572ede42f4
-  data.tar.gz: ee33a1019e9d512c0a6afd7e70528b5bfaad8d53de1b00f3087d0e3945af1d0a
+  metadata.gz: ec55e1ae9f1ad84dd5ee189215011bb6e84fde797d229d7c2965294c4330004a
+  data.tar.gz: bf3c4dd72c1ba1d60d978309a00bfeef09c8e6b55ab449d56b1d6bd9ee48af31
 SHA512:
-  metadata.gz: c5fb77d00c5ddf0ac067793357ad3dd961d37d47a0fedf152a1c90fe3b1013c35c88ca6496c5265389ca8f14927b77ce8f88a3def1c384e6938aae5617f78016
-  data.tar.gz: 665945789543418c34fe598e4aca5796bcabb0dfebcd19dced9da2c9fab1850136f8b6c76dbec180800f1478aac3e7f74fa10cc2cb9c1b30c1f1bf98a38d5de8
+  metadata.gz: b2afa0026ce65f039d1db74bffe5f9dd3d6e85ce8879760d66c44260fac26b5a6f2876af3135ef3ad5086f898f505d9da2834a742531a0645cf9b28952b97136
+  data.tar.gz: eb2f854603ca55a6d1bb14c73e7bc55ab319bacb894fe605cb1264a0fd1a2b1494e5a4abf8987a307a1088f1b7b7da67cbd8b4e5fec0fde7a0e3e31fe43a1f7d

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2021-2023 Ismo Kärkkäinen
+Copyright (c) 2021-2024 Ismo Kärkkäinen
 
 The Universal Permissive License (UPL), Version 1.0
 

data/bin/diagrammatron-copy

@@ -0,0 +1,103 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Copyright © 2023 Ismo Kärkkäinen
+# Licensed under Universal Permissive License. See LICENSE.txt.
+
+require_relative '../lib/common'
+require 'optparse'
+
+def make_dst2src(args)
+  dst2src = {}
+  (0...args.size).step(2) do |sidx|
+    src = args[sidx]
+    dst = args[sidx + 1]
+    dst2src[dst] = src
+  end
+  dst2src
+end
+
+def invert(dst2src)
+  src2dst = {}
+  dst2src.each do |dst, src|
+    src2dst[src] = src2dst.fetch(src, []).push(dst)
+  end
+  src2dst
+end
+
+def gather_values(item, src2dst)
+  vals = {}
+  src2dst.each_key do |src|
+    v = item.fetch(src, nil)
+    vals[src] = v unless v.nil?
+  end
+  vals
+end
+
+def copy_fields(item, src2dst)
+  vals = gather_values(item, src2dst)
+  copied = {}
+  vals.each do |src, v|
+    src2dst[src].each do |dst|
+      copied[dst] = v
+    end
+  end
+  copied
+end
+
+def main
+  input = nil
+  output = nil
+  input_output_schema = 'copy'
+  ENV['POSIXLY_CORRECT'] = '1' # Leaves field name pairs as they are.
+  parser = OptionParser.new do |opts|
+    opts.summary_indent = '  '
+    opts.summary_width = 20
+    opts.banner = 'Usage: diagrammatron-copy [options] source destination ...'
+    opts.separator ''
+    opts.separator 'Options:'
+    opts.on('-i', '--input FILE', 'Input file name. Read from stdin if not given.') do |filename|
+      input = filename
+    end
+    opts.on('-o', '--output FILE', 'Output file name. Write to stdout if not given.') do |filename|
+      output = filename
+    end
+    opts.on('-h', '--help', 'Print this help and exit.') do
+      $stdout.puts %(#{opts}
+Source and destination are field names in pairs.
+
+Input and output YAML file schema is returned by:
+diagrammatron-schema #{input_output_schema}
+
+Output is the input file with fields in nodes and edges copied from source,
+when present, to destination field name. All copies are made at the same
+time, so you can swap field contents, but chaining the copying is not
+supported. In such case, provide the same source field in multiple pairs.
+)
+      exit 0
+    end
+  end
+  parser.parse! ARGV
+
+  return aargh('Field name count is not multiple of 2', 1) if ARGV.size.odd?
+
+  # Same source can be copied to multiple destinations.
+  # Same destination copied to multiple times, last copy remains.
+  # Make destination from source mapping and then invert it for actual use.
+  src2dst = invert(make_dst2src(ARGV))
+
+  doc = load_verified(input, input_output_schema)
+  return 2 if doc.nil?
+
+  %w[edges nodes].each do |category|
+    items = doc.fetch(category, nil)
+    next if items.nil?
+    items.each do |item|
+      copies = copy_fields(item, src2dst)
+      item.merge!(copies)
+    end
+  end
+  save_verified(output, doc, 4, input_output_schema)
+end
+
+exit(main) if (defined? $unit_test).nil?

data/bin/diagrammatron-edges

@@ -153,6 +153,7 @@ def segment(x0, y0, x1, y1)
   Segment.new(vert, cc, range, 0, [false, false], 0)
 end
 
+# side_index is 0 up, 1 right, 2 down, 3 left.
 Connection = Struct.new(:node_index, :side_index)
 
 $paths = {}
@@ -576,6 +577,7 @@ def place_edges(work)
     $insignificant = 0.1 / (splits.values.max + 1)
     splits = nil
 
+    # Ordering of segments in gaps between nodes.
     gaps = {
       false => {},
       true => {}

data/bin/diagrammatron-nodes

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright © 2021-2023 Ismo Kärkkäinen
+# Copyright © 2021-2024 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
 require_relative '../lib/common'
@@ -9,12 +9,27 @@ require 'optparse'
 require 'set'
 
 
+def horizontal(work)
+  count = {}
+  work[:nodes].each_index do |k|
+    node = work[:nodes][k]
+    c = count.fetch(node[:yo], 0)
+    node[:xo] = c
+    node[:yo] = 0 unless node.key?(:yo)
+    node[:sid] = 0
+    count[node[:yo]] = c + 1
+  end
+end
+
 def vertical(work)
+  count = {}
   work[:nodes].each_index do |k|
     node = work[:nodes][k]
-    node[:xo] = 0
-    node[:yo] = k
+    c = count.fetch(node[:xo], 0)
+    node[:xo] = 0 unless node.key?(:xo)
+    node[:yo] = c
     node[:sid] = 0
+    count[node[:xo]] = c + 1
   end
 end
 
@@ -269,7 +284,8 @@ end
 
 $algorithms = {
   'pathlength' => method(:pathlength2coordinates),
-  'vertical' => method(:vertical)
+  'vertical' => method(:vertical),
+  'horizontal' => method(:horizontal)
 }
 
 def work_copy(src, quiet)
@@ -296,6 +312,11 @@ def work_copy(src, quiet)
   nodes.each_index do |k|
     work[:nodes].push({ idx: k })
     node = nodes[k]
+    # Retain xo, yo if present.
+    %i[xo yo].each do |s|
+      sk = s.to_s
+      work[:nodes].last[s] = node[sk] if node.key?(sk)
+    end
     label = node['label']
     if label2idx.key?(label) && edge_nodes.member?(label)
       aargh "Edge-referred label used twice: #{label}"
@@ -361,7 +382,7 @@ def main
     opts.on('-h', '--help', 'Print this help and exit.') do
       $stdout.puts opts
       $stdout.puts %(
-Algorithm names are: #{$algorithms.keys.sort.join(' ')}
+Algorithm names are: #{$algorithms.keys.sort!.join(' ')}
 
 Input YAML file schema is returned by:
 diagrammatron-schema #{input_schema}

data/lib/copy.yaml

@@ -0,0 +1,13 @@
+type: object
+properties:
+  edges:
+    type: array
+    minItems: 0
+    items:
+      type: object
+  nodes:
+    type: array
+    minItems: 0
+    items:
+      type: object
+additionalProperties: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diagrammatron
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.1
 platform: ruby
 authors:
 - Ismo Kärkkäinen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-21 00:00:00.000000000 Z
+date: 2024-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schemer
@@ -36,6 +36,7 @@ description: |2
   programs that each perform one stage.
 email: ismokarkkainen@icloud.com
 executables:
+- diagrammatron-copy
 - diagrammatron-get
 - diagrammatron-edges
 - diagrammatron-nodes
@@ -50,6 +51,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
+- bin/diagrammatron-copy
 - bin/diagrammatron-edges
 - bin/diagrammatron-get
 - bin/diagrammatron-nodes
@@ -61,6 +63,7 @@ files:
 - bin/diagrammatron-template
 - bin/dot_json2diagrammatron
 - lib/common.rb
+- lib/copy.yaml
 - lib/edges.yaml
 - lib/nodes.yaml
 - lib/place.yaml