Repository '2d_feature_extraction'
hg clone https://toolshed.g2.bx.psu.edu/repos/imgteam/2d_feature_extraction

Changeset 1:f03b4da203d0 (2019-07-09)
Previous changeset 0:96909b9d1df1 (2019-02-09) Next changeset 2:6fdb3542a406 (2019-07-22)
Commit message:
planemo upload for repository https://github.com/BMCV/galaxy-image-analysis/tools/2d_feature_extraction/ commit e45ba62aae80d942bbf1cbf572bd9aec64297900
modified:
2d_feature_extraction.py
2d_feature_extraction.xml
b
diff -r 96909b9d1df1 -r f03b4da203d0 2d_feature_extraction.py
--- a/2d_feature_extraction.py Sat Feb 09 14:28:26 2019 -0500
+++ b/2d_feature_extraction.py Tue Jul 09 08:35:50 2019 -0400
[
@@ -118,7 +118,9 @@
 if args.moments or args.all_features:
     df['moments'] = df['it'].map(lambda ait: regions[ait].moments)
 if args.convexity or args.all_features:
-    df['convexity'] = df.area/(df.perimeter*df.perimeter)
+    perimeter = df['it'].map(lambda ait: regions[ait].perimeter)
+    area = df['it'].map(lambda ait: regions[ait].area)
+    df['convexity'] = area/(perimeter*perimeter)
 
 del df['it']
 df.to_csv(out_file, sep='\t', line_terminator='\n', index=False)
b
diff -r 96909b9d1df1 -r f03b4da203d0 2d_feature_extraction.xml
--- a/2d_feature_extraction.xml Sat Feb 09 14:28:26 2019 -0500
+++ b/2d_feature_extraction.xml Tue Jul 09 08:35:50 2019 -0400
b
@@ -1,4 +1,4 @@
-<tool id="ip_2d_feature_extraction" name="2D Feature Extraction" version="0.0.8">
+<tool id="ip_2d_feature_extraction" name="2D Feature Extraction" version="0.0.9">
     <description>Feature Extraction</description>
     <requirements>
         <requirement type="package" version="0.23.4">pandas</requirement>