at_coder_friends-generator-python_ref 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e84ac238506799a393d6a5728476aacad96218b
-  data.tar.gz: d08501d453284d7a299ab0caad8333edcc5bb585
+  metadata.gz: ea05cb41657896054fae4fbc7980c10b0045855a
+  data.tar.gz: ab907ac801f09f2e50947ee6d8c94f03dbb65840
 SHA512:
-  metadata.gz: b8a1108c6d301523371c5185cc582cf6bc30b3a98fb2218b413ce777f05d56c94b5ad8d6fcc61c3429e3993d0b894d02d34c6833c874cd1b5694ba5903346e3f
-  data.tar.gz: e59912f8024f5925f1442d78fd16ccb02bdbc8591fb0af1ae792c7b2968f684382c4e383182b3b427ea9a714c4523b6e56ca57b4895ba173ab18639a311ab39f
+  metadata.gz: 07a6667e4fa8d98b4776a79040cbcc99d004b91b03ece2568163e0e114fd10373b9e32fb5bf45d8a423b719f7c53980af9f6caa86c2972d0272d112aad1cbe8b
+  data.tar.gz: 9671cbdc3f4d4e90b178722aac7cab94ba72eee5c4003dd1d672ee29f698c3b1a9fb0943057575c8007e4c89e6ab2a0c2d9d45ca6ce5992d8ce6a7b154ba3fef

data/CHANGELOG.md

@@ -1,6 +1,26 @@
 # Change log
 
-## master(unreleased)
+## master (unreleased)
+
+## 0.2.0 (2020-01-05)
+
+### Added
+- at_coder_friends 0.6.3 support
+- 'vertical array + matrix' input format support.
+- 'matrix + vertical array' input format support.
+- 'vertically expanded matrices' input format support.
+- 'horizontally expanded matrices' input format support.
+- decimal type support.
+- input data with delimiter(- : /) support.
+
+### Changed
+- Change template file format to ERB.
+- Template file integration
+
+### Deleted
+- Template file for interactive problems.
+- '### OUTPUT ###' embedding pattern.
+- '### URL ###' embedding pattern.
 
 ## 0.1.0 (2019-10-31)
 - Initial implementation

data/Gemfile.lock

@@ -1,14 +1,15 @@
 PATH
   remote: .
   specs:
-    at_coder_friends-generator-python_ref (0.1.0)
+    at_coder_friends-generator-python_ref (0.2.0)
+      at_coder_friends (~> 0.6.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    at_coder_friends (0.6.1)
+    at_coder_friends (0.6.3)
       colorize (~> 0.8.1)
       launchy (~> 2.4.3)
       mechanize (~> 2.0)
@@ -37,7 +38,7 @@ GEM
     net-http-digest_auth (1.4.1)
     net-http-persistent (3.1.0)
       connection_pool (~> 2.2)
-    nokogiri (1.10.4)
+    nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
     ntlm-http (0.1.1)
     public_suffix (4.0.1)
@@ -62,9 +63,9 @@ GEM
 
 PLATFORMS
   ruby
+  x64-mingw32
 
 DEPENDENCIES
-  at_coder_friends (~> 0.6)
   at_coder_friends-generator-python_ref!
   bundler (~> 2.0)
   rake (~> 10.0)

data/README.md

@@ -21,27 +21,28 @@ Or install it yourself as:
 
 ## Configuration
 
-Add ```PythonRef``` to ```generators``` setting in ```.at_coder_friends.yml```:
-  ```YAML
-  generators:
-    - PythonRef
-  ```
+Add ```PythonRef``` to ```generators``` setting in ```.at_coder_friends.yml```
 
 ## Generator Options
 
-You can set following options to ```generator_settings/PythonRef``` setting  
-in ```.at_coder_friends.yml```:
+Following options are available  
+in ```generator_settings/PythonRef``` section of ```.at_coder_friends.yml```:
 
-| Setting | Description | Default |
+| Option | Description | Default |
 |---------|-------------|---------|
-|default_template|Source template file path|[/templates/python_ref_default.py](/templates/python_ref_default.py)|
-|interactive_template|Source template file path for interactive problems|[/templates/python_ref_interactive.py](/templates/python_ref_interactive.py)|
+|default_template|Source template file path|[/templates/python_ref.py.erb](/templates/python_ref.py.erb)|
 
-### Example
+## ```.at_coder_friends.yml``` example for Python
   ```YAML
+  generators:
+    - PythonRef
   generator_settings:
     PythonRef:
       default_template: /path/to/template
+  ext_settings:
+    'py':
+      test_cmd:
+        default: 'python "{dir}/{base}.py"'
   ```
 
 ## Development

data/at_coder_friends-generator-python_ref.gemspec

@@ -6,14 +6,13 @@ require 'at_coder_friends/generator/python_ref/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'at_coder_friends-generator-python_ref'
-  spec.version       = AtCoderFriends::Generator::PythonRef::VERSION
+  spec.version       = AtCoderFriends::Generator::PythonRefConstants::VERSION
   spec.authors       = ['nejiko96']
   spec.email         = ['nejiko2006@gmail.com']
 
   spec.summary       = 'Python generator for AtCoderFriends'
   spec.description   = <<-DESCRIPTION
-  AtCoderFriends plugin
-  which Generates Python source from problem description
+  Python source generator works as a plugin for AtCoderFriends
   (reference implementation)
   DESCRIPTION
   spec.homepage      = 'https://github.com/nejiko96/at_coder_friends-generator-python_ref'
@@ -33,11 +32,14 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3.0'
 
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = spec.homepage
-  spec.metadata['changelog_uri'] = spec.homepage + '/CHANGELOG.md'
+  spec.metadata = {
+    'homepage_uri' => spec.homepage,
+    'source_code_uri' => spec.homepage,
+    'changelog_uri' => 'https://github.com/nejiko96/at_coder_friends-generator-python_ref/blob/master/CHANGELOG.md'
+  }
+
+  spec.add_dependency 'at_coder_friends', '~> 0.6.3'
 
-  spec.add_development_dependency 'at_coder_friends', '~> 0.6'
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

data/lib/at_coder_friends/generator/python_ref.rb

@@ -1,47 +1,27 @@
 # frozen_string_literal: true
 
+require 'at_coder_friends'
 require 'at_coder_friends/generator/python_ref/version'
 
 module AtCoderFriends
   module Generator
     # generates Python source from problem description
-    class PythonRef
+    class PythonRef < Base
+      include PythonRefConstants
+
       ACF_HOME = File.realpath(File.join(__dir__, '..', '..', '..'))
       TMPL_DIR = File.join(ACF_HOME, 'templates')
-      DEFAULT_TMPL = File.join(TMPL_DIR, 'python_ref_default.py')
-      INTERACTIVE_TMPL = File.join(TMPL_DIR, 'python_ref_interactive.py')
-
-      attr_reader :cfg, :pbm
-
-      def initialize(cfg = nil)
-        @cfg = cfg || {}
-      end
-
-      def process(pbm)
-        src = generate(pbm)
-        pbm.add_src(:py, src)
-      end
-
-      def generate(pbm)
-        @pbm = pbm
-        File
-          .read(select_template)
-          .gsub('### URL ###', pbm.url)
-          .gsub('### CONSTS ###', gen_consts.join("\n"))
-          .gsub('### DCLS ###', gen_decls.join("\n"))
-          .gsub('### OUTPUT ###', gen_output)
-      end
-
-      def select_template(interactive = pbm.options.interactive)
-        interactive ? interactive_template : default_template
-      end
+      DEFAULT_TMPL = File.join(TMPL_DIR, 'python_ref.py.erb')
+      ATTRS = Attributes.new(:py, DEFAULT_TMPL)
 
-      def default_template
-        cfg['default_template'] || DEFAULT_TMPL
+      def attrs
+        ATTRS
       end
 
-      def interactive_template
-        cfg['interactive_template'] || INTERACTIVE_TMPL
+      def render(src)
+        src = embed_lines(src, '### CONSTS ###', gen_consts)
+        src = embed_lines(src, '### DCLS ###', gen_decls)
+        src
       end
 
       def gen_consts(constants = pbm.constants)
@@ -67,35 +47,45 @@ module AtCoderFriends
         when :harray
           gen_harray_decl(inpdef)
         when :varray
-          if inpdef.names.size == 1
-            gen_varray_1_decl(inpdef)
-          else
-            gen_varray_n_decl(inpdef)
-          end
+          gen_varray_decl(inpdef)
         when :matrix
           gen_matrix_decl(inpdef)
+        when :varray_matrix, :matrix_varray
+          gen_cmb_decl(inpdef)
+        when :vmatrix
+          gen_vmatrix_decl(inpdef)
+        when :hmatrix
+          gen_hmatrix_decl(inpdef)
         end
       end
 
       def gen_single_decl(inpdef)
         names = inpdef.names
         dcl = names.join(', ')
-        expr = gen_expr(inpdef.item, names.size > 1)
+        expr = gen_expr(inpdef, names.size > 1)
         "#{dcl} = #{expr}"
       end
 
       def gen_harray_decl(inpdef)
         v = inpdef.names[0]
         dcl = "#{v}s"
-        expr = gen_expr(inpdef.item, true)
+        expr = gen_expr(inpdef, true)
         "#{dcl} = #{expr}"
       end
 
+      def gen_varray_decl(inpdef)
+        if inpdef.names.size == 1
+          gen_varray_1_decl(inpdef)
+        else
+          gen_varray_n_decl(inpdef)
+        end
+      end
+
       def gen_varray_1_decl(inpdef)
         v = inpdef.names[0]
         sz = inpdef.size[0]
         dcl = "#{v}s"
-        expr = gen_expr(inpdef.item, false)
+        expr = gen_expr(inpdef, false)
         "#{dcl} = [#{expr} for _ in range(#{sz})]"
       end
 
@@ -103,7 +93,7 @@ module AtCoderFriends
         names = inpdef.names
         sz = inpdef.size[0]
         dcl = names.map { |v| "#{v}s[i]" }.join(', ')
-        expr = gen_expr(inpdef.item, true)
+        expr = gen_expr(inpdef, true)
         ret = []
         ret += names.map { |v| "#{v}s = [None for _ in range(#{sz})]" }
         ret << "for i in range(#{sz}):"
@@ -115,28 +105,86 @@ module AtCoderFriends
         v = inpdef.names[0]
         sz = inpdef.size[0]
         decl = "#{v}ss"
-        expr = gen_expr(inpdef.item, true)
+        expr = gen_expr(inpdef, true)
         "#{decl} = [#{expr} for _ in range(#{sz})]"
       end
 
-      def gen_expr(item, split)
-        case item
+      def gen_cmb_decl(inpdef)
+        mx = inpdef.container == :varray_matrix ? -1 : 0
+        vs = inpdef.names.map { |v| "#{v}s" }
+        vs[mx] += 's'
+        sz = inpdef.size[0]
+        dcls = vs.map { |v| "#{v}[i]" }
+        dcls[mx] = '*' + dcls[mx] unless inpdef.item == :char
+        dcl = dcls.join(', ')
+        expr = gen_cmb_expr(inpdef)
+        ret = []
+        ret += vs.map { |v| "#{v} = [None for _ in range(#{sz})]" }
+        ret << "for i in range(#{sz}):"
+        ret << "    #{dcl} = #{expr}"
+        ret
+      end
+
+      def gen_vmatrix_decl(inpdef)
+        names = inpdef.names
+        sz1, sz2 = inpdef.size
+        dcl = names.map { |v| "#{v}ss[i][j]" }.join(', ')
+        expr = gen_expr(inpdef, true)
+        ret = []
+        ret += names.map do |v|
+          "#{v}ss = [[None for _ in range(#{sz2})] for _ in range(#{sz1})]"
+        end
+        ret << "for i in range(#{sz1}):"
+        ret << "    for j in range(#{sz2}):"
+        ret << "        #{dcl} = #{expr}"
+        ret
+      end
+
+      def gen_hmatrix_decl(inpdef)
+        names = inpdef.names
+        sz = inpdef.size[0]
+        dcls = names.map { |v| "#{v}ss[i]" }
+        expr = gen_expr(inpdef, true)
+        ret = []
+        ret += names.map { |v| "#{v}ss = [None for _ in range(#{sz})]" }
+        ret << "for i in range(#{sz}):"
+        ret << "    line = #{expr}"
+        ret += dcls.map.with_index do |dcl, i|
+          "    #{dcl} = line[#{i}::#{dcls.size}]"
+        end
+        ret
+      end
+
+      def gen_expr(inpdef, split)
+        read = gen_read(inpdef.delim)
+        case inpdef.item
         when :number
-          split ? 'list(map(int, input().split()))' : 'int(input())'
+          split ? "list(map(int, #{read}.split()))" : "int(#{read})"
+        when :decimal
+          split ? "list(map(float, #{read}.split()))" : "float(#{read})"
         when :string
-          split ? 'input().split()' : 'input()'
+          split ? "#{read}.split()" : read
         when :char
-          'input()'
+          read
         end
       end
 
-      def gen_output(vs = pbm.options.binary_values)
-        if vs
-          "print('#{vs[0]}' if cond else '#{vs[1]}')"
-        else
-          'print(ans)'
+      def gen_cmb_expr(inpdef)
+        read = gen_read(inpdef.delim)
+        case inpdef.item
+        when :number
+          "list(map(int, #{read}.split()))"
+        when :decimal
+          "list(map(float, #{read}.split()))"
+        when :string, :char
+          "#{read}.split()"
         end
       end
+
+      def gen_read(delim)
+        sub = delim.chars.map { |d| ".replace('#{d}', ' ')" }.join
+        "input()#{sub}"
+      end
     end
   end
 end

data/lib/at_coder_friends/generator/python_ref/version.rb

@@ -2,8 +2,8 @@
 
 module AtCoderFriends
   module Generator
-    class PythonRef
-      VERSION = '0.1.0'
+    module PythonRefConstants
+      VERSION = '0.2.0'
     end
   end
 end

data/templates/python_ref.py.erb

@@ -0,0 +1,13 @@
+# <%= pbm.url %>
+
+### CONSTS ###
+
+### DCLS ###
+
+<%
+if (vs = pbm.options.binary_values)
+%>print('<%= vs[0] %>' if cond else '<%= vs[1] %>')<%
+else
+%>print(ans)<%
+end
+%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: at_coder_friends-generator-python_ref
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - nejiko96
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2020-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: at_coder_friends
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
+        version: 0.6.3
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -67,8 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 description: |2
-    AtCoderFriends plugin
-    which Generates Python source from problem description
+    Python source generator works as a plugin for AtCoderFriends
     (reference implementation)
 email:
 - nejiko2006@gmail.com
@@ -93,15 +92,14 @@ files:
 - bin/setup
 - lib/at_coder_friends/generator/python_ref.rb
 - lib/at_coder_friends/generator/python_ref/version.rb
-- templates/python_ref_default.py
-- templates/python_ref_interactive.py
+- templates/python_ref.py.erb
 homepage: https://github.com/nejiko96/at_coder_friends-generator-python_ref
 licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/nejiko96/at_coder_friends-generator-python_ref
   source_code_uri: https://github.com/nejiko96/at_coder_friends-generator-python_ref
-  changelog_uri: https://github.com/nejiko96/at_coder_friends-generator-python_ref/CHANGELOG.md
+  changelog_uri: https://github.com/nejiko96/at_coder_friends-generator-python_ref/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:

data/templates/python_ref_default.py

@@ -1,7 +0,0 @@
-# ### URL ###
-
-### CONSTS ###
-
-### DCLS ###
-
-### OUTPUT ###

data/templates/python_ref_interactive.py

@@ -1,7 +0,0 @@
-# ### URL ###
-
-### CONSTS ###
-
-### DCLS ###
-
-### OUTPUT ###