merge input and output tables into io tables

aszepieniec · Jan 2, 2022 · a6dd7ed · a6dd7ed
1 parent 557206d
commit a6dd7ed
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 100 deletions.
diff --git a/code/input_extension.py → code/io_extension.py b/code/input_extension.py → code/io_extension.py
@@ -1,13 +1,13 @@
-from input_table import *
+from io_table import *
 
-class InputExtension(InputTable):
+class IOExtension(IOTable):
     def __init__(self, gamma):
         field = gamma.field
 
         # names for challenges
         self.gamma = MPolynomial.constant(gamma)
 
-        super(InputExtension, self).__init__(field)
+        super(IOExtension, self).__init__(field)
         self.width = 1+2
 
     @staticmethod
@@ -46,7 +46,7 @@ def extend(input_table, gamma):
 
             table_extension += [new_row]
 
-        extended_input_table = InputExtension(gamma)
+        extended_input_table = IOExtension(gamma)
         extended_input_table.table = table_extension
 
         return extended_input_table

diff --git a/code/input_table.py → code/io_table.py b/code/input_table.py → code/io_table.py
@@ -1,8 +1,8 @@
 from aet import *
 
-class InputTable(Table):
+class IOTable(Table):
     def __init__(self, field):
-        super(InputTable, self).__init__(field, 1)
+        super(IOTable, self).__init__(field, 1)
 
     def transition_constraints(self):
         return []

diff --git a/code/output_extension.py b/code/output_extension.py
diff --git a/code/output_table.py b/code/output_table.py
diff --git a/code/test_vm.py b/code/test_vm.py
@@ -1,4 +1,8 @@
 from extension import ExtensionField
+from instruction_extension import InstructionExtension
+from io_extension import IOExtension
+from memory_extension import MemoryExtension
+from processor_extension import ProcessorExtension
 from vm import *
 import os
 
@@ -41,8 +45,8 @@ def test_air( ):
     processor_extension = ProcessorExtension.extend(processor_table, a, b, c, d, e, f, alpha, beta, gamma, delta)
     instruction_extension = InstructionExtension.extend(instruction_table, a, b, c, alpha, eta)
     memory_extension = MemoryExtension.extend(memory_table, d, e, f, beta)
-    input_extension = InputExtension.extend(input_table, gamma)
-    output_extension = OutputExtension.extend(output_table, delta)
+    input_extension = IOExtension.extend(input_table, gamma)
+    output_extension = IOExtension.extend(output_table, delta)
 
     processor_extension.test()
     instruction_extension.test()

diff --git a/code/vm.py b/code/vm.py
@@ -1,15 +1,9 @@
 from algebra import *
-from input_extension import InputExtension
-from input_table import InputTable
-from instruction_extension import InstructionExtension
+from io_table import IOTable
 from instruction_table import InstructionTable
-from memory_extension import MemoryExtension
 from memory_table import MemoryTable
 from multivariate import *
 import sys
-from output_extension import OutputExtension
-from output_table import OutputTable
-from processor_extension import ProcessorExtension
 
 from processor_table import ProcessorTable
 
@@ -140,9 +134,9 @@ def F(x): return BaseFieldElement(ord(x), field)
         instruction_table.table = [[BaseFieldElement(i, field), program[i]] for i in range(
             len(program))] + [[register.instruction_pointer, register.current_instruction]]
 
-        input_table = InputTable(field)
+        input_table = IOTable(field)
 
-        output_table = OutputTable(field)
+        output_table = IOTable(field)
 
         # main loop
         while register.instruction_pointer.value < len(program):