Simplify variables vocabulary and syntax

[cbenz]

Following #348 discussion, here are some ideas.

Merge @reference_formula decorator with SimpleFormulaColumn metaclass.

Before:

# Input variable
reference_input_variable(
    name = "age",
    column = IntCol,
    entity_class = Individus,
    )

# Variable with formula
@reference_formula
class irpp(SimpleFormulaColumn):
    column = FloatCol
    entity_class = FoyersFiscaux

    def function(self, simulation, period):
        return period, x

After:

# Input variable
class age(Variable):
    column = IntCol
    entity_class = Individus

# Variable with formula
class irpp(Variable):
    column = FloatCol
    entity_class = FoyersFiscaux

    def function(self, simulation, period):
        return period, x

[benjello]

It is clean and i follow you on that side. But didn't you loose the information by removing the reference_formula decorator ? No side-effect on reforms ?

[cbenz]

No problem, sorry I didn't explain.

The Variable inherited class would be different in openfisca-france and extensions:

• In OpenFisca-France:

  from .formulas import Variable
  
  class irpp(Variable):
      column = FloatCol
      entity_class = FoyersFiscaux
  
      def function(self, simulation, period):
          return period, x

• In an extension:

  Extension = extensions.make_extension(...)
  
  class irpp(Extension.Variable):
      column = FloatCol
      entity_class = FoyersFiscaux
  
      def function(self, simulation, period):
          return period, x

[benjello]

Ok then.

[fpagnoux]

Any news on this topic ? I can help this week if needed :)

[cbenz]

We forget to handle a case when a reform updates a variable giving the reference = attribute: 1503255 and test b84c00e

[cbenz]

Tests still don't pass with https://github.com/openfisca/openfisca-france-indirect-taxation

[cbenz]

Merged in master of all projects, pushed, Travis tests ongoing (but all were OK on my machine).

In case of emergency please just do git reset --hard <ref> where <ref> is the last commit before merge.

[cbenz]

Good work everyone!

[cbenz]

Not closing issue because of openfisca/openfisca-france#350, openfisca/openfisca-france#369 and #365

[benjello]

@fpagnoux @cbenz : should we close this issue ?

[fpagnoux]

I would say yes.

[fpagnoux]

And this one as well.