summaryrefslogtreecommitdiff
path: root/src/de/lmu/ifi/dbs/elki/visualization/style
diff options
context:
space:
mode:
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/visualization/style')
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/ClassStylingPolicy.java10
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/ClusterStylingPolicy.java47
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/PropertiesBasedStyleLibrary.java9
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/SingleObjectsStylingPolicy.java2
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/StyleLibrary.java2
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/StyleResult.java2
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/StylingPolicy.java2
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/classic.properties6
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/default.properties6
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/greyscale.properties6
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/lines/DashedLineStyleLibrary.java2
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/lines/LineStyleLibrary.java2
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/lines/SolidLineStyleLibrary.java2
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/lines/package-info.java2
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/marker/CircleMarkers.java2
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/marker/MarkerLibrary.java2
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/marker/MinimalMarkers.java2
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/marker/PrettyMarkers.java2
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/marker/package-info.java2
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/neon.properties6
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/package-info.java2
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/presentation.properties6
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/print.properties6
-rw-r--r--src/de/lmu/ifi/dbs/elki/visualization/style/wikipedia.properties77
24 files changed, 158 insertions, 49 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/ClassStylingPolicy.java b/src/de/lmu/ifi/dbs/elki/visualization/style/ClassStylingPolicy.java
index 82000e42..0e60b051 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/ClassStylingPolicy.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/ClassStylingPolicy.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.style;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2012
+ Copyright (C) 2013
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
@@ -63,4 +63,12 @@ public interface ClassStylingPolicy extends StylingPolicy {
* @return Iterator over object IDs
*/
public DBIDIter iterateClass(int cnum);
+
+ /**
+ * Get the number of elements in the styling class.
+ *
+ * @param cnum Class number
+ * @return Size of class.
+ */
+ public int classSize(int cnum);
} \ No newline at end of file
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/ClusterStylingPolicy.java b/src/de/lmu/ifi/dbs/elki/visualization/style/ClusterStylingPolicy.java
index 7adecc68..cd2fd17b 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/ClusterStylingPolicy.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/ClusterStylingPolicy.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.style;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2012
+ Copyright (C) 2013
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
@@ -24,6 +24,8 @@ package de.lmu.ifi.dbs.elki.visualization.style;
*/
import gnu.trove.list.array.TIntArrayList;
+import gnu.trove.map.TObjectIntMap;
+import gnu.trove.map.hash.TObjectIntHashMap;
import java.awt.Color;
import java.util.ArrayList;
@@ -54,6 +56,11 @@ public class ClusterStylingPolicy implements ClassStylingPolicy {
ArrayList<DBIDs> ids;
/**
+ * Map from cluster objects to color offsets.
+ */
+ TObjectIntMap<Cluster<?>> cmap;
+
+ /**
* Colors
*/
TIntArrayList colors;
@@ -73,21 +80,22 @@ public class ClusterStylingPolicy implements ClassStylingPolicy {
this.clustering = clustering;
ColorLibrary colorset = style.getColorSet(StyleLibrary.PLOT);
List<? extends Cluster<?>> clusters = clustering.getAllClusters();
- ids = new ArrayList<DBIDs>(clusters.size());
+ ids = new ArrayList<>(clusters.size());
colors = new TIntArrayList(clusters.size());
+ cmap = new TObjectIntHashMap<>(clusters.size(), .5f, -1);
Iterator<? extends Cluster<?>> ci = clusters.iterator();
- for(int i = 0; ci.hasNext(); i++) {
+ for (int i = 0; ci.hasNext(); i++) {
Cluster<?> c = ci.next();
ids.add(DBIDUtil.ensureSet(c.getIDs()));
+ cmap.put(c, i);
Color col = SVGUtil.stringToColor(colorset.getColor(i));
- if(col != null) {
+ if (col != null) {
colors.add(col.getRGB());
- }
- else {
+ } else {
LoggingUtil.warning("Unrecognized color name: " + colorset.getColor(i));
}
- if(!ci.hasNext()) {
+ if (!ci.hasNext()) {
break;
}
}
@@ -95,8 +103,8 @@ public class ClusterStylingPolicy implements ClassStylingPolicy {
@Override
public int getStyleForDBID(DBIDRef id) {
- for(int i = 0; i < ids.size(); i++) {
- if(ids.get(i).contains(id)) {
+ for (int i = 0; i < ids.size(); i++) {
+ if (ids.get(i).contains(id)) {
return i;
}
}
@@ -105,8 +113,8 @@ public class ClusterStylingPolicy implements ClassStylingPolicy {
@Override
public int getColorForDBID(DBIDRef id) {
- for(int i = 0; i < ids.size(); i++) {
- if(ids.get(i).contains(id)) {
+ for (int i = 0; i < ids.size(); i++) {
+ if (ids.get(i).contains(id)) {
return colors.get(i);
}
}
@@ -128,6 +136,11 @@ public class ClusterStylingPolicy implements ClassStylingPolicy {
return ids.get(cnum).iter();
}
+ @Override
+ public int classSize(int cnum) {
+ return ids.get(cnum).size();
+ }
+
/**
* Get the clustering used by this styling policy
*
@@ -136,4 +149,14 @@ public class ClusterStylingPolicy implements ClassStylingPolicy {
public Clustering<?> getClustering() {
return clustering;
}
-} \ No newline at end of file
+
+ /**
+ * Get the style number for a cluster.
+ *
+ * @param c Cluster
+ * @return Style number
+ */
+ public int getStyleForCluster(Cluster<?> c) {
+ return cmap.get(c);
+ }
+}
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/PropertiesBasedStyleLibrary.java b/src/de/lmu/ifi/dbs/elki/visualization/style/PropertiesBasedStyleLibrary.java
index 6b0869fb..ee9c9b3e 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/PropertiesBasedStyleLibrary.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/PropertiesBasedStyleLibrary.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.style;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2012
+ Copyright (C) 2013
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
@@ -26,11 +26,12 @@ package de.lmu.ifi.dbs.elki.visualization.style;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Properties;
import de.lmu.ifi.dbs.elki.logging.Logging;
import de.lmu.ifi.dbs.elki.utilities.FileUtil;
-import de.lmu.ifi.dbs.elki.utilities.datastructures.AnyMap;
import de.lmu.ifi.dbs.elki.utilities.exceptions.AbortException;
import de.lmu.ifi.dbs.elki.visualization.colors.ColorLibrary;
import de.lmu.ifi.dbs.elki.visualization.colors.ListBasedColorLibrary;
@@ -99,7 +100,7 @@ public class PropertiesBasedStyleLibrary implements StyleLibrary {
/**
* Cache
*/
- private AnyMap<String> cache = new AnyMap<String>();
+ private Map<String, Object> cache = new HashMap<>();
/**
* Line style library to use
@@ -167,7 +168,7 @@ public class PropertiesBasedStyleLibrary implements StyleLibrary {
* @return Resulting value
*/
private <T> T getCached(String prefix, String postfix, Class<T> cls) {
- return cache.get(prefix + '.' + postfix, cls);
+ return cls.cast(cache.get(prefix + '.' + postfix));
}
/**
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/SingleObjectsStylingPolicy.java b/src/de/lmu/ifi/dbs/elki/visualization/style/SingleObjectsStylingPolicy.java
index f6ba0ccc..c367eb24 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/SingleObjectsStylingPolicy.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/SingleObjectsStylingPolicy.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.style;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2012
+ Copyright (C) 2013
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/StyleLibrary.java b/src/de/lmu/ifi/dbs/elki/visualization/style/StyleLibrary.java
index 588c0bc8..6c7b841f 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/StyleLibrary.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/StyleLibrary.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.style;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2012
+ Copyright (C) 2013
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/StyleResult.java b/src/de/lmu/ifi/dbs/elki/visualization/style/StyleResult.java
index e8f0d3fb..231a1cd8 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/StyleResult.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/StyleResult.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.style;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2012
+ Copyright (C) 2013
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/StylingPolicy.java b/src/de/lmu/ifi/dbs/elki/visualization/style/StylingPolicy.java
index d2390ea0..98ed25e1 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/StylingPolicy.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/StylingPolicy.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.style;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2012
+ Copyright (C) 2013
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/classic.properties b/src/de/lmu/ifi/dbs/elki/visualization/style/classic.properties
index fe9f3e96..66df4720 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/classic.properties
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/classic.properties
@@ -37,10 +37,10 @@ axis.tick.line-width=0.002
## Axis label font size
axis.label.text-size=0.02
-## Named color for the background of the key box
-key.background-color=none
## Named color for a label in the key part
-key.label.color=black
+key.text-size=0.007
+key.color=black
+key.hierarchy.line-width=0.05
## A list of color names for data lines
# We stick to primary colors first to have the least issues
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/default.properties b/src/de/lmu/ifi/dbs/elki/visualization/style/default.properties
index ca892a6e..bfcaaa3a 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/default.properties
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/default.properties
@@ -37,10 +37,10 @@ axis.tick.line-width=0.002
## Axis label font size
axis.label.text-size=0.02
-## Named color for the background of the key box
-key.background-color=none
## Named color for a label in the key part
-key.label.color=black
+key.text-size=0.007
+key.color=black
+key.hierarchy.line-width=0.1
## A list of color names for data lines
colorset=#ed420e,#fdca19,#4548a5,#7ebd3a,#a81e51,#00748b,#fa8116,#512d85,#008a7a,#fea918,#019d60,#cfde3d,#015a9c,#7b1760
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/greyscale.properties b/src/de/lmu/ifi/dbs/elki/visualization/style/greyscale.properties
index 0e7c96e0..f27a85a2 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/greyscale.properties
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/greyscale.properties
@@ -37,10 +37,10 @@ axis.tick.line-width=0.002
## Axis label font size
axis.label.text-size=0.02
-## Named color for the background of the key box
-key.background-color=none
## Named color for a label in the key part
-key.label.color=black
+key.text-size=0.007
+key.color=black
+key.hierarchy.line-width=0.05
## A list of color names for data lines
# We stick to primary colors first to have the least issues
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/lines/DashedLineStyleLibrary.java b/src/de/lmu/ifi/dbs/elki/visualization/style/lines/DashedLineStyleLibrary.java
index e3abd7c1..35c47eb7 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/lines/DashedLineStyleLibrary.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/lines/DashedLineStyleLibrary.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.style.lines;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2012
+ Copyright (C) 2013
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/lines/LineStyleLibrary.java b/src/de/lmu/ifi/dbs/elki/visualization/style/lines/LineStyleLibrary.java
index 79f3eda0..6c817778 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/lines/LineStyleLibrary.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/lines/LineStyleLibrary.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.style.lines;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2012
+ Copyright (C) 2013
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/lines/SolidLineStyleLibrary.java b/src/de/lmu/ifi/dbs/elki/visualization/style/lines/SolidLineStyleLibrary.java
index 51491db2..340381a1 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/lines/SolidLineStyleLibrary.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/lines/SolidLineStyleLibrary.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.style.lines;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2012
+ Copyright (C) 2013
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/lines/package-info.java b/src/de/lmu/ifi/dbs/elki/visualization/style/lines/package-info.java
index 57a2ee6b..ef9d9af7 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/lines/package-info.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/lines/package-info.java
@@ -6,7 +6,7 @@
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2012
+ Copyright (C) 2013
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/marker/CircleMarkers.java b/src/de/lmu/ifi/dbs/elki/visualization/style/marker/CircleMarkers.java
index ae066c9e..f78c72de 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/marker/CircleMarkers.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/marker/CircleMarkers.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.style.marker;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2012
+ Copyright (C) 2013
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/marker/MarkerLibrary.java b/src/de/lmu/ifi/dbs/elki/visualization/style/marker/MarkerLibrary.java
index ccddba7d..75591c93 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/marker/MarkerLibrary.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/marker/MarkerLibrary.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.style.marker;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2012
+ Copyright (C) 2013
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/marker/MinimalMarkers.java b/src/de/lmu/ifi/dbs/elki/visualization/style/marker/MinimalMarkers.java
index b7ad6274..4111dbbc 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/marker/MinimalMarkers.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/marker/MinimalMarkers.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.style.marker;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2012
+ Copyright (C) 2013
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/marker/PrettyMarkers.java b/src/de/lmu/ifi/dbs/elki/visualization/style/marker/PrettyMarkers.java
index 7352fea3..d99d92a7 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/marker/PrettyMarkers.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/marker/PrettyMarkers.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.style.marker;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2012
+ Copyright (C) 2013
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/marker/package-info.java b/src/de/lmu/ifi/dbs/elki/visualization/style/marker/package-info.java
index a0672ffb..78ad8b57 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/marker/package-info.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/marker/package-info.java
@@ -6,7 +6,7 @@
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
-Copyright (C) 2012
+Copyright (C) 2013
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/neon.properties b/src/de/lmu/ifi/dbs/elki/visualization/style/neon.properties
index 81515031..d18c393a 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/neon.properties
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/neon.properties
@@ -37,10 +37,10 @@ axis.tick.line-width=0.002
## Axis label font size
axis.label.text-size=0.02
-## Named color for the background of the key box
-key.background-color=none
## Named color for a label in the key part
-key.label.color=white
+key.text-size=0.007
+key.color=white
+key.hierarchy.line-width=0.05
## A list of color names for data lines
# We stick to primary colors first to have the least issues
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/package-info.java b/src/de/lmu/ifi/dbs/elki/visualization/style/package-info.java
index e45cca0f..179472f7 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/package-info.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/package-info.java
@@ -6,7 +6,7 @@
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
-Copyright (C) 2012
+Copyright (C) 2013
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/presentation.properties b/src/de/lmu/ifi/dbs/elki/visualization/style/presentation.properties
index 01264673..d30667b6 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/presentation.properties
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/presentation.properties
@@ -37,10 +37,10 @@ axis.tick.line-width=0.004
## Axis label font size
axis.label.text-size=0.03
-## Named color for the background of the key box
-key.background-color=none
## Named color for a label in the key part
-key.label.color=black
+key.text-size=0.01
+key.color=black
+key.hierarchy.line-width=0.1
## A list of color names for data lines
# We stick to primary colors first to have the least issues
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/print.properties b/src/de/lmu/ifi/dbs/elki/visualization/style/print.properties
index 930a8d1c..02c19ba1 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/style/print.properties
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/print.properties
@@ -37,10 +37,10 @@ axis.tick.line-width=0.004
## Axis label font size
axis.label.text-size=0.03
-## Named color for the background of the key box
-key.background-color=none
## Named color for a label in the key part
-key.label.color=black
+key.text-size=0.007
+key.color=black
+key.hierarchy.line-width=0.05
## A list of color names for data lines
# We stick to primary colors first to have the least issues
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/style/wikipedia.properties b/src/de/lmu/ifi/dbs/elki/visualization/style/wikipedia.properties
new file mode 100644
index 00000000..e02ad985
--- /dev/null
+++ b/src/de/lmu/ifi/dbs/elki/visualization/style/wikipedia.properties
@@ -0,0 +1,77 @@
+## Libraries
+lines-library = SolidLineStyleLibrary
+marker-library = CircleMarkers
+
+## Default foreground color
+color=black
+## Default font family
+font-family='Times New Roman', serif
+## Default background color
+background-color=white
+## Default line width
+line-width=0.01
+## Text font size scale
+text-size=0.03
+## Text color
+text-color=black
+## Default margin (relative)
+margin.size=0.1
+
+## Named color for the page background
+page.background-color=white
+## Background color for plot area
+plot.background-color=none
+
+## Named color for a typical axis
+axis.color=black
+## Named color for a typical axis tick mark
+axis.tick.color=gray
+## Named color for a typical axis tick mark
+axis.tick.minor.color=silver
+## Named color for a typical axis label
+axis.label.color=black
+## Axis line width
+axis.line-width=0.002
+## Axis tick width
+axis.tick.line-width=0.002
+## Axis label font size
+axis.label.text-size=0.02
+
+## Named color for a label in the key part
+key.text-size=0.007
+key.color=black
+key.hierarchy.line-width=0.05
+
+## A list of color names for data lines
+# We stick to primary colors first to have the least issues
+# The first two colors are red and blue to help red-green blind people.
+# Yellow usually offers bad contrast, therefore comes late.
+# Magenta often shows up too similar to red, cyan too similar to blue in print.
+colorset=red,blue,green,orange,cyan,magenta,darkred,darkblue,darkgreen
+## Line width scaling (for graphs)
+plot.line-width=0.005
+## For the cluster order
+plot.clusterorder.line-width=0.002
+## Bubble sizes (relative)
+plot.bubble.size=0.10
+## Marker size (relative)
+plot.marker.size=0.01
+## Dot size
+plot.dot.size=0.005
+## Reference points
+plot.referencepoints.size=0.003
+plot.referencepoints.color=red
+## Polygons
+plot.polygons.line-width=0.001
+plot.polygons.color=gray
+
+## Curve vis (ROC curves) labels:
+curve.labels.text-size=0.04
+
+# Text size in overview plot
+overview.labels.text-size=0.08
+
+## Selection colors
+plot.selection.color=darkblue
+plot.selection.opacity=0.25
+plot.selection.size=0.015