OK, I removed the LAMA translators.

About the no-invariants.patch, I copied to the trunk translator to save it for
now. In the future, I guess we should make this an option of the translator.
I'll open a separate ticket for that.

Malte: Sure, the three LAMA translators can be removed now.

Gabi: The file "no-invariants.patch" is a patch that turns off invariant
generation in the translator (i.e., the resulting output will have exactly the
binary variables of the PDDL input). This has been helpful for some people in
tasks where the invariant generation was not working properly, so I've been
giving this patch to people as a work-around for their problems. It might be
worthwile to keep this file... or put an option into the translator that skips
invariant generation.

I deleted the aij-translator branch.

Silvia, I would also like to delete the remaining three branches of the translator:

branches/lama/trunk/downward/translate
branches/lama/branches/lama-integration/downward/translate
branches/lama/branches/experimental/downward/translate

Is that OK with you? They should all be superseded by the translator in trunk,
which is essentially the LAMA translator, but with some more detailed
information about which parts of the translator take how much time.

Once that is done, we're finished unifying the translator. :-)

I merged the aij-translator into the trunk.

Now there is an additional file relaxed_task.py that might do 
something similar as relaxed_tasks.py and translate_relaxed.py, 
but I did not look into that.

I merged the lama translator into the trunk, which
implies three major changes to the trunk version:
- support of action-costs (r3283)
- the invariant synthesis is aborted if it takes too
  long or finds too many invariant candidates (r3284)
- conflicting add and delete effects are now handled
  differently (r3285)

Open issues:
- I did *not* yet adapt the following files that exist only
  in the trunk:
  * additive-hmax.py
  * relaxed_tasks.py
  * run-additive-hmax
  * translate-relaxed.py
- I ignored the file no-invariants.patch in the lama
  translator directory. Is this file still in use and
  should it be merged to the trunk?

I removed the translators that we don't need to merge and checked that indeed
there is nothing interesting in their code. The current codebase (r3272) now
contains the following translator versions, excluding ext and temporal branches:

# find . | grep '/translate$' | grep -v '/results/translate$' | grep -v temporal
| grep -v /ext/

./trunk/downward/translate
./branches/lama/trunk/downward/translate
./branches/lama/branches/lama-integration/downward/translate
./branches/lama/branches/experimental/downward/translate
./branches/aij-translator/downward/translate
./branches/aij-translator-exp/downward/translate

Of these, the three LAMA translators are completely identical, and I'll get rid
of aij-translator-exp soon. So what remains to do is to merge the translators of
aij-translator and lama into the trunk.

The translators in the aij-translator and aij-translator-exp branches have been
merged to the extent that this makes sense (r3269), and the translator in the
aij-translator branch is the one that we should integrate into the trunk.

We need to merge the translators from the various branches of the code, namely:

 * everything
 * lama/trunk
 * aij-translator
 * aij-translator-exp
 * any others that are different from everything