Révision 3967

TXM/trunk/bundles/org.txm.analec.rcp/src/org/txm/macro/urs/exploit/UnitsIndexMacro.groovy (revision 3967)
42 42
}
43 43

  
44 44
// BEGINNING OF PARAMETERS
45
@Field @Option(name="sep_selection", usage="Output options", widget="Separator", required=false, def="Selection")
46
sep_selection
45 47
@Field @Option(name="schema_ursql", usage="TYPE@PROP=VALUE", widget="String", required=false, def="CHAINE")
46 48
		String schema_ursql
47 49
@Field @Option(name="minimum_schema_size", usage="Minimum size needed to consider a schema", widget="Integer", required=false, def="3")
......
62 64
		strict_inclusion
63 65
@Field @Option(name="position_in_matches", usage="Unit distance to structure limit (0 = no selection, 1 = first after limit, -1 = last before limit, etc.)", widget="Integer", required=false, def="0")
64 66
		position_in_matches
67
		
68
@Field @Option(name="sep_output", usage="Output options", widget="Separator", required=false, def="Output options")
69
		sep_output
70
@Field @Option(name="output_sort", usage="Sort: name, frequence", widget="StringArray", metaVar="name	frequence", required=false, def="frequence")
71
		output_sort
72
@Field @Option(name="output_canonical_sort", usage="If sort must be canonical, put here the keys order", widget="String", required=false, def="")
73
		output_canonical_sort
65 74
//@Field @Option(name="output_2D", usage="output barplot or 3D plot", widget="Boolean", required=true, def="true")
66 75
		output_2D = true
67 76
@Field @Option(name="output_showlegend", usage="output barplot or 3D plot", widget="Boolean", required=false, def="true")
......
170 179
	println "No values for $unit_property_display property"
171 180
	return
172 181
}
173
keys = keys.sort()
182

  
183
println allresults.keySet()
184
if (output_canonical_sort.length() > 0) {
185
	output_canonical_sort = output_canonical_sort.split(",") as List
186
	output_canonical_sort.retainAll(keys)
187
	keys = output_canonical_sort
188
} else {
189
	if (output_sort == "name") {
190
		keys = keys.sort()
191
	} else {
192
		keys = keys.sort() { it ->
193
				int i = 0;
194
				for (def h : allresults.values()) i += h[it] 
195
				return -i;
196
			}
197
	}
198
}
174 199
mFactory = DoubleFactory2D.dense
175 200
matrix = mFactory.make(keys.size(), selection.size())
176 201

  

Formats disponibles : Unified diff