summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormr <mr@mrautenberg.de>2011-10-19 16:37:29 +0200
committermr <mr@mrautenberg.de>2011-10-19 16:37:29 +0200
commit4de463a50864de22a15351c0d859ba9a0946b610 (patch)
tree665cd8511c46214e4d1cb276d6c382d9f4744517
parent32a6b36b7286171f99b64df3ec8e8a5e5c8d0695 (diff)
parent596659faa751d19c90f72218592991cf0b773817 (diff)
Merge branch 'development' into lazar-gui
-rw-r--r--ChangeLog6
-rw-r--r--views/neighbors.haml2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..51762ea
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,6 @@
+v3.0.1 2011-10-19
+ * assign a model to an endpoints on creating a new model,
+ endpoint-list from ontology service,
+ endpoint uri in "Training dataset"
+ * fix missing "measured activity" predicting a classification model
+
diff --git a/views/neighbors.haml b/views/neighbors.haml
index e2d65fa..49b72b7 100644
--- a/views/neighbors.haml
+++ b/views/neighbors.haml
@@ -14,7 +14,7 @@
- compound = OpenTox::Compound.new(neighbor[OT.compound])
%tr
%td.image= compound_image(compound,@prediction.descriptors(compound),@value_map)
- %td= activity_markup(neighbor[OT.measuredActivity], @value_map)
+ %td= activity_markup(neighbor[OT.measuredActivity].to_s, @value_map)
%td= sprintf('%.03g', neighbor[OT.similarity])
%td
%ul