topas-tools 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 987df3ec3a644e10544cc624319256d6cae2db0d
-  data.tar.gz: 452e747ae4ab2be232b55c68b6d11582341f5046
+  metadata.gz: ebd3b0096d76533b4ad2b3b29d13e9c0fb440ec2
+  data.tar.gz: 3f9822ab33d2135dda7593b0d7fcea801feef74f
 SHA512:
-  metadata.gz: f9ab976c9b4e1118b8ea2d49e547e58d8fee48f3bf23bac7b4de838191d739e0eaba5db9c2ffac090fe1e9daa2102cf3257a9d3b342400ae9dbe616ff1301fe3
-  data.tar.gz: cb1b3808929fd8e51f68abe5d6ae90fa805aadae4ff3b50042ab1673d898263ef57b8f2f7ba12238552e3dbb836d569b886c7721e60cfced5c0ad14e35217b87
+  metadata.gz: 391701df3da48ef07f27893af04a5aa73deaad6bfc4782b5691d9e2991e861fb1da4b153ecdab7d5be71448f7f61a1eb8976ab29b7d94ba691277dc89b35fdd1
+  data.tar.gz: 2175813c9d94dcd5593b8796d4229607a63aedb09bc3e5adf280e0256651b80dedb7d820e6b9bf2bebc6d2d1a8db2209cb0b8ba69190700354f672931e5937fb

data/bin/toparunGUI

@@ -18,7 +18,7 @@ Shoes.app :width => 400, :height => 800  do
     #big stack
     stack do
       caption 'Your system:'
-      @systemlist = list_box items:['wine','windows','dummy'], choose:'wine' 
+      @systemlist = list_box items:['wine','windows','dummy'], choose:'windows' 
 
       caption 'Your Topas4-2 directory:'
       
@@ -39,7 +39,7 @@ Shoes.app :width => 400, :height => 800  do
       end
 
       flow do
-        para "Points:"
+        para "Stepss:"
         @stepsline = edit_line
         @stepsline.text = "4,1"
       end
@@ -51,26 +51,25 @@ Shoes.app :width => 400, :height => 800  do
         end
       end
 
-        button 'Mf button!' do
-          begin
-            points = @pointline.text.split(/[,\s]+/).map(&:to_f)
-            steps  = @stepsline.text.split(/[,\s]+/).map(&:to_f)
-            rescue alert("Some issues with steps'n'points!")
-          end
-
-          Thread.new(points, steps, @log ) do  |points, steps|
-            inp = @inpline.text
-            TopasEngine.system = @systemlist.text.to_sym
-            TopasEngine.topasdir = @topasdir.text
-            runner = TopasEngine.new File.dirname(inp) 
-            input = TopasInput.new IO.read(inp, :encoding => "UTF-8"),  inp
-            runner.refine input,  points, steps,  BaseAnalyzer.new(@log)
-            @clear = button 'Clear' do
-              @log = StringIO.new
-              @clear.clear
-            end
+      button 'Go!' do
+        begin
+          points = @pointline.text.split(/[,\s]+/).map(&:to_f)
+          steps  = @stepsline.text.split(/[,\s]+/).map(&:to_f)
+        rescue alert("Some issues with steps'n'points!")
+        end
+        
+        Thread.new(points, steps, @log ) do  |points, steps|
+          inp = @inpline.text
+          engine = TopasEngine.create  @systemlist.text.to_sym, @topasdir.text
+          input = TopasInput.new IO.read(inp, :encoding => "UTF-8"),  inp
+          runner = Metarefine.new engine, input, File.dirname(inp), Steps.new(points, steps)
+          runner.toparun  BaseAnalyzer.new(@log)
+          @clear = button 'Clear' do
+            @log = StringIO.new
+            @clear.clear
           end
         end
+      end
   
         para self
       caption "Log:"

data/lib/topas-tools.rb

@@ -1,3 +1,4 @@
 require 'topas-tools/TopasEngine.rb'
 require 'topas-tools/TopasInput.rb'
 require 'topas-tools/Analyzers.rb'
+require 'topas-tools/Metarefine.rb'

data/lib/topas-tools/Metarefine.rb

@@ -0,0 +1,36 @@
+class Steps
+  def initialize ps, ss
+    ss.empty? &&  raise("Empty steps!")
+    (ps.size == (ss.size + 1) ) || raise("Inconsistent points and steps: #{ps}, #{ss}")   
+    @k1s = get_k1s ps, ss
+  end
+  attr_reader :k1s
+  def get_k1s points, stepsizes 
+    stepsizes.reduce([]){|result, stepsize| 
+      a = result + 
+          points[0].step(points[1] ,-stepsize.to_f).to_a + 
+          [points[1].to_f]
+      points.shift
+      a}.uniq
+  end    
+end
+
+class Metarefine 
+  def initialize engine, input, basedir, steps
+    @engine = engine
+    @input = input
+    @basedir = basedir
+    @steps = steps 
+    Dir.chdir @basedir
+  end
+
+  def toparun analyzer, work_dir = File.expand_path(@input.base_name)
+    Dir.mkdir(work_dir) unless Dir.exists? work_dir
+    @steps.k1s.reduce(@input) do |inp, k1|
+      out = @engine.tc work_dir inp.set_k1(k1)
+      analyzer.analyze(out) ? out : break
+    end
+    Dir.chdir @base_dir
+    analyzer.report
+  end
+end

data/lib/topas-tools/TopasEngine.rb

@@ -1,79 +1,56 @@
 class TopasEngine
-  
-  Systems = [:windows, :wine, :dummy]
-  
-  @@topasdir = "/home/dmitrienka/.wine/drive_c/TOPAS4-2/" #Depends!
-  @@system     = :dummy                                   #[:wine, : :windows, :dummy]
-
-  
-  def self.system=(system)
-    if Systems.any?{|sys| sys = system}
-      @@system = system
+  def self.create system, topasdir
+    case system
+    when :wine
+      WineTopasEngine.new    topasdir
+    when :windows
+      WindowsTopasEngine.new topasdir
+    when :dummy
+      TopasEngine.new        topasdir
     else
-      raise "Unknown system!"
+      raise "Bad system: #{system}"
     end
   end
-
-  def self.topasdir=(topasdir)
+  
+  def initialize topasdir
+    @enc = 'UTF-8'
     Dir.exists?(topasdir) || raise("Non-existing directory!")
     Dir.entries(topasdir).any?{|f| f == 'tc.exe'} || raise("Where is my tc.exe?!")
-    @@topasdir = topasdir
-  end
-
-
-  def initialize dir = Dir.getwd
-    @base_dir = dir
-    Dir.chdir @base_dir
-    @enc = "UTF-8"
+    @topasdir = topasdir    
   end
 
-  def tc input
+  def tc dir, input
     infile = "#{input.name}.inp"
+    Dir.chdir dir
     File.open(infile, mode:'w'){|f| f.write input.text}
-    case @@system
-    when :wine
-      path = `winepath -w #{infile}`.gsub('\\', '\\\\\\').gsub("\n", "")
-      command = "wine tc.exe #{path}"
-      go_n_do command
-    when :windows
-      command = "tc.exe #{File.expand_path(infile)}"
-      go_n_do command
-    when :dummy
-     outfile = "#{input.name}.out"
-      p "Say hello to #{outfile} with k1 = #{input.k1}"
-      File.open(outfile , mode:'w'){|f| f.write input.text}
-    end
+    cmd = command infile
+    Dir.chdir @topasdir
+    system(cmd)
+    Dir.chdir dir
     TopasInput.new IO.read("#{input.name}.out", :encoding => @enc)
   end
-  
 
-  def  refine input, ps, ss,  analyzer = BaseAnalyzer.new
-    k1s = get_k1s ps, ss
-    name = input.base_name
-    Dir.mkdir(name) unless Dir.exists? name
-    @work_dir = File.expand_path(name)
-    Dir.chdir @work_dir
-    k1s.reduce(input) do |inp, k1|
-      out = tc inp.set_k1(k1)
-      analyzer.analyze(out) ? out : break
-    end
-    Dir.chdir @base_dir
-    analyzer.report
+  private
+  
+  def command filename
+    filepath = File.expand_path filename
+    dirpath =  File.dirname filepath
+    outfile =  File.join dirpath, filename.sub(/\..{2,3}$/ , '.out')
+    "cp #{filepath} #{outfile}"
   end
+end
 
+class WindowsTopasEngine < TopasEngine
   private
-  
-  def go_n_do command
-    Dir.chdir @@topasdir
-    system(command)
-    Dir.chdir @work_dir
+  def command infile
+    "tc.exe #{File.expand_path(infile)}"
   end
+end
 
-  def get_k1s points, stepsizes 
-    stepsizes.inject([]){|result, stepsize| 
-      a = result + points[0].step(points[1] ,-stepsize).to_a
-      points.shift
-      a}.uniq
+class WineTopasEngine < TopasEngine
+  private
+  def command infile
+    path = `winepath -w #{infile}`.gsub('\\', '\\\\\\').gsub("\n", "")
+    "wine tc.exe #{path}"
   end
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: topas-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Artem Dmitrienko
@@ -42,6 +42,7 @@ files:
 - bin/toparunGUI
 - lib/topas-tools.rb
 - lib/topas-tools/Analyzers.rb
+- lib/topas-tools/Metarefine.rb
 - lib/topas-tools/TopasEngine.rb
 - lib/topas-tools/TopasInput.rb
 homepage: https://github.com/dmitrienka/topas-tools