Merge Marc's work

o1vm/src/interpreters/mips/column.rs

@@ -67,14 +67,14 @@ pub enum ColumnAlias {
     Selector(usize),
     Lookup(LookupTableID, usize),
     // TODO add
-    /* LookupPartialSum((u32, usize)),
+    LookupPartialSum((u32, usize)),
     /// Multiplicities, indexed. This corresponds to the `m_i`. First
     /// indexed by table ID, then internal index.
     LookupMultiplicity((u32, usize)),
     /// The lookup aggregation, i.e. `phi`
     LookupAggregation,
     /// The fixed tables. The parameter is considered to the indexed table.
-    LookupFixedTable(u32), */
+    LookupFixedTable(u32),
 }
 
 /// The columns used by the MIPS circuit. The MIPS circuit is split into three

o1vm/src/interpreters/mips/constraints.rs

@@ -20,7 +20,6 @@ use kimchi::circuits::{
 };
 use std::{array, collections::HashMap};
 use strum::IntoEnumIterator;
-
 use super::column::N_MIPS_SEL_COLS;
 
 /// The environment keeping the constraints between the different polynomials
@@ -69,7 +68,7 @@ impl<Fp: Field> InterpreterEnv for Env<Fp> {
 
     fn alloc_lookup(&mut self, table_id: LookupTableID) -> Self::Position {
         let idx = self.scratch_lookups.get_mut(&table_id).unwrap();
-        *idx = *idx + 1;
+        *idx += 1;
         MIPSColumn::Lookup(table_id, *idx - 1)
         // TODO
     }