gv_fsm 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61d5d6c1ef593ce7d516c48ab905c210d3005081fdd241b47298c55c5340236c
-  data.tar.gz: d8bc69220e149140bd150ad3890dbf11e33651352bf22df483b7941c9a9911c7
+  metadata.gz: 1706418c51873674098f304fe267d662d211728675db2ca78687efcb49b2ba95
+  data.tar.gz: 991b5f7b6d1173d4e08a9635ebbce25f654c88521a913ce7514a51e09cd1d3fd
 SHA512:
-  metadata.gz: c92f9ebb2275bfb8fd4fa23060cc22c8d34fe2e7eb219e9833f60517417ca11a420758c99fb0bee82cc58795f184a44d230bf03ae947072e1a72271bad34b2c9
-  data.tar.gz: 7a2898d7f153fe7c80a9eb046c54bd4076ffa15bf69987f069d94a70708a17085641fc7dff765fd7816df839f469ce363e7793122e5d09538e882667d5e83650
+  metadata.gz: 3f2d8954ab0a5a009bd5cf6b31ca7d6927a680681e81dbd3a70d0aaa598234b8c71e91098c6e1aa011244ec05973611184b9c22bbbd28d32a1ff90e7e89350f9
+  data.tar.gz: 0b8d6e7a3fe3fe9434d3d58371b38edf5a82651cd9b9fdffec415c531ee0deaea6418ddce70520d19c20d4e83f044c9e51cb5bb53964827b9eaae762621d59e9

data/bin/gv_fsm

@@ -73,7 +73,20 @@ unless sm.parse(ARGV[0]) then
   exit 3
 end
 
-puts "Parsed #{sm.dotfile}.\nGenerating C stub for states: #{sm.states_list.join(", ")}."
+puts "Parsed #{sm.dotfile}"
+top = sm.topology
+puts "Graph topology:"
+puts "  Pure source nodes: #{top[:sources].join(', ')}"
+puts "  Pure sink nodes:   #{top[:sinks].empty? ? "<none>" : top[:sinks].join(', ')}"
+
+if !(top[:sources].count == 1 and top[:sinks].count <= 1) then
+  puts "Topology error: there must be exactly one source and zero or one sink"
+  exit 4
+end
+
+puts "Generating C functions for states: #{sm.states_list.join(", ")}."
+puts "                   for transition: #{sm.transition_functions_list.join(", ")}."
+
 
 if options[:header] then
   name = sm.generate_h 

data/lib/gv_fsm.rb

@@ -2,6 +2,7 @@
 
 require 'ruby-graphviz'
 require 'erb'
+require 'matrix'
 
 require File.expand_path('../templates.rb', __FILE__)
 require File.expand_path("../version.rb", __FILE__)
@@ -17,6 +18,8 @@ module GV_FSM
       @syslog = true
       @ino = false
       @error = nil
+      @matrix = nil
+      @nodemap = {}
       parse(filename) if filename
     end
 
@@ -39,11 +42,14 @@ module GV_FSM
           @error = "Graph is not directed"
           return nil
         end
-        if g.node_count == 0 then
+        n = g.node_count
+        if n == 0 then
           @error = "Graph is empty"
           return nil
         end
+        @matrix = Matrix.zero(n, n)
         @description = g.name
+        i = 0
         g.each_node do |id|
           n = g.get_node(id)
           if n[:label].source.empty? or
@@ -52,9 +58,12 @@ module GV_FSM
           else
             label = n[:label].source
           end
+          @nodemap[id] = i
+          i += 1
           @states << {id: id, function: @prefix+label}
         end
         g.each_edge do |e|
+          @matrix[@nodemap[e.node_one], @nodemap[e.node_two]] += 1
           from = e.node_one
           to = e.node_two
           unless e[:label] then
@@ -145,6 +154,16 @@ module GV_FSM
       return fname
     end
 
+    def topology
+      res = {matrix: @matrix}
+      # rows have the number of froms, columns the number of tos
+      res[:froms] = @matrix.row_vectors.map {|v| v.sum }
+      res[:tos] = @matrix.column_vectors.map {|v| v.sum }
+      res[:sinks] = res[:froms].each_index.select {|i| res[:froms][i] == 0}.map {|i| @nodemap.keys[i]}
+      res[:sources] = res[:tos].each_index.select {|i| res[:tos][i] == 0}.map {|i| @nodemap.keys[i]}
+      return res
+    end
+
   end
 
 end

data/lib/templates.rb

@@ -258,10 +258,11 @@ module GV_FSM
       }
       */
       <% else %>
+      <% nsinks = topology[:sinks].count %>
       #ifdef TEST_MAIN
       #include <unistd.h>
       int main() {
-        <%= @prefix %>state_t cur_state = <%= @prefix.upcase %>STATE_INIT;
+        <%= @prefix %>state_t cur_state = <%= @prefix.upcase %>STATE_<%= @states.first[:id].upcase %>;
       <% if @syslog then %>
         openlog("SM", LOG_PID | LOG_PERROR, LOG_USER);
         syslog(LOG_INFO, "Starting SM");
@@ -269,7 +270,11 @@ module GV_FSM
         do {
           cur_state = <%= @prefix %>run_state(cur_state, NULL);
           sleep(1);
-        } while (cur_state != <%= @prefix.upcase %>STATE_STOP);
+      <% if nsinks == 1 %>
+        } while (cur_state != <%= @prefix.upcase %>STATE_<%= topology[:sinks][0].upcase %>);
+      <% else %>
+        } while (1);
+      <% end %>
         return 0;
       }
       #endif

data/lib/version.rb

@@ -1,3 +1,3 @@
 module GV_FSM
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gv_fsm
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Paolo Bosetti