Browse Source

Slight re-arrange in PRISM settings.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2526 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 15 years ago
parent
commit
feb75b5c3c
  1. 88
      prism/src/prism/PrismSettings.java

88
prism/src/prism/PrismSettings.java

@ -96,6 +96,22 @@ public class PrismSettings implements Observer
public static final String PRISM_EXPORT_ADV = "prism.exportAdv";
public static final String PRISM_EXPORT_ADV_FILENAME = "prism.exportAdvFilename";
//Simulator
public static final String SIMULATOR_DEFAULT_NUM_SAMPLES = "simulator.defaultNumSamples";
public static final String SIMULATOR_DEFAULT_CONFIDENCE = "simulator.defaultConfidence";
public static final String SIMULATOR_DEFAULT_WIDTH = "simulator.defaultWidth";
public static final String SIMULATOR_DEFAULT_APPROX = "simulator.defaultApprox";
public static final String SIMULATOR_DEFAULT_MAX_PATH = "simulator.defaultMaxPath";
public static final String SIMULATOR_DECIDE = "simulator.decide";
public static final String SIMULATOR_ITERATIONS_TO_DECIDE = "simulator.iterationsToDecide";
public static final String SIMULATOR_MAX_REWARD = "simulator.maxReward";
public static final String SIMULATOR_SIMULTANEOUS = "simulator.simultaneous";
public static final String SIMULATOR_FIELD_CHOICE = "simulator.fieldChoice";
public static final String SIMULATOR_NEW_PATH_ASK_INITIAL = "simulator.newPathAskDefault";
public static final String SIMULATOR_NEW_PATH_ASK_VIEW = "simulator.newPathAskView";
public static final String SIMULATOR_RENDER_ALL_VALUES = "simulator.renderAllValues";
public static final String SIMULATOR_NETWORK_FILE = "simulator.networkFile";
//GUI Model
public static final String MODEL_AUTO_PARSE = "model.autoParse";
public static final String MODEL_AUTO_MANUAL = "model.autoManual";
@ -126,22 +142,6 @@ public class PrismSettings implements Observer
public static final String PROPERTIES_ADDITION_STRATEGY = "properties.additionStategy";
public static final String PROPERTIES_CLEAR_LIST_ON_LOAD = "properties.clearListOnLoad";
//Simulator
public static final String SIMULATOR_DEFAULT_NUM_SAMPLES = "simulator.defaultNumSamples";
public static final String SIMULATOR_DEFAULT_CONFIDENCE = "simulator.defaultConfidence";
public static final String SIMULATOR_DEFAULT_WIDTH = "simulator.defaultWidth";
public static final String SIMULATOR_DEFAULT_APPROX = "simulator.defaultApprox";
public static final String SIMULATOR_DEFAULT_MAX_PATH = "simulator.defaultMaxPath";
public static final String SIMULATOR_DECIDE = "simulator.decide";
public static final String SIMULATOR_ITERATIONS_TO_DECIDE = "simulator.iterationsToDecide";
public static final String SIMULATOR_MAX_REWARD = "simulator.maxReward";
public static final String SIMULATOR_SIMULTANEOUS = "simulator.simultaneous";
public static final String SIMULATOR_FIELD_CHOICE = "simulator.fieldChoice";
public static final String SIMULATOR_NEW_PATH_ASK_INITIAL = "simulator.newPathAskDefault";
public static final String SIMULATOR_NEW_PATH_ASK_VIEW = "simulator.newPathAskView";
public static final String SIMULATOR_RENDER_ALL_VALUES = "simulator.renderAllValues";
public static final String SIMULATOR_NETWORK_FILE = "simulator.networkFile";
//GUI Log
public static final String LOG_FONT = "log.font";
public static final String LOG_SELECTION_COLOUR = "log.selectionColour";
@ -154,17 +154,17 @@ public class PrismSettings implements Observer
public static final String[] propertyOwnerNames =
{
"PRISM",
"Simulator",
"Model",
"Properties",
"Simulator",
"Log"
};
public static final int[] propertyOwnerIDs =
{
PropertyConstants.PRISM,
PropertyConstants.SIMULATOR,
PropertyConstants.MODEL,
PropertyConstants.PROPERTIES,
PropertyConstants.SIMULATOR,
PropertyConstants.LOG
};
@ -244,32 +244,6 @@ public class PrismSettings implements Observer
{ STRING_TYPE, PRISM_EXPORT_ADV_FILENAME, "Adversary export filename", "3.3", "adv.tra", "",
"Name of file for MDP adversary export (if enabled)" },
},
{
{ BOOLEAN_TYPE, MODEL_AUTO_PARSE, "Auto parse", "2.1", new Boolean(true), "", "Parse PRISM models automatically as they are loaded/edited in the text editor." },
{ BOOLEAN_TYPE, MODEL_AUTO_MANUAL, "Manual parse for large models", "2.1", new Boolean(true), "", "Disable automatic model parsing when loading large PRISM models." },
{ INTEGER_TYPE, MODEL_PARSE_DELAY, "Parse delay (ms)", "2.1", new Integer(1000), "0,", "Time delay (after typing has finished) before an automatic re-parse of the model is performed." },
{ FONT_COLOUR_TYPE, MODEL_PRISM_EDITOR_FONT, "PRISM editor font", "2.1", new FontColorPair(new Font("monospaced", Font.PLAIN, 12), Color.black), "", "Font used in the PRISM model text editor." },
{ BOOLEAN_TYPE, MODEL_SHOW_LINE_NUMBERS, "PRISM editor line numbers", "3.2", new Boolean(true), "", "Enable or disable line numbers in the PRISM model text editor" },
{ COLOUR_TYPE, MODEL_PRISM_EDITOR_BG_COLOUR, "PRISM editor background", "2.1", new Color(255,255,255), "", "Background colour for the PRISM model text editor." },
{ COLOUR_TYPE, MODEL_PRISM_EDITOR_NUMERIC_COLOUR, "PRISM editor numeric colour", "2.1", new Color(0,0,255), "", "Syntax highlighting colour for numerical values in the PRISM model text editor." },
{ CHOICE_TYPE, MODEL_PRISM_EDITOR_NUMERIC_STYLE, "PRISM editor numeric style", "2.1", "Plain", "Plain,Italic,Bold,Bold Italic", "Syntax highlighting style for numerical values in the PRISM model text editor." },
{ COLOUR_TYPE, MODEL_PRISM_EDITOR_IDENTIFIER_COLOUR, "PRISM editor identifier colour", "2.1", new Color(255,0,0), "", "Syntax highlighting colour for identifiers values in the PRISM model text editor" },
{ CHOICE_TYPE, MODEL_PRISM_EDITOR_IDENTIFIER_STYLE, "PRISM editor identifier style", "2.1", "Plain", "Plain,Italic,Bold,Bold Italic", "Syntax highlighting style for identifiers in the PRISM model text editor." },
{ COLOUR_TYPE, MODEL_PRISM_EDITOR_KEYWORD_COLOUR, "PRISM editor keyword colour", "2.1", new Color(0,0,0), "", "Syntax highlighting colour for keywords in the PRISM model text editor" },
{ CHOICE_TYPE, MODEL_PRISM_EDITOR_KEYWORD_STYLE, "PRISM editor keyword style", "2.1", "Bold", "Plain,Italic,Bold,Bold Italic", "Syntax highlighting style for keywords in the PRISM model text editor." },
{ COLOUR_TYPE, MODEL_PRISM_EDITOR_COMMENT_COLOUR, "PRISM editor comment colour", "2.1", new Color(0,99,0), "", "Syntax highlighting colour for comments in the PRISM model text editor." },
{ CHOICE_TYPE, MODEL_PRISM_EDITOR_COMMENT_STYLE, "PRISM editor comment style", "2.1", "Italic", "Plain,Italic,Bold,Bold Italic", "Syntax highlighting style for comments in the PRISM model text editor." },
{ FONT_COLOUR_TYPE, MODEL_PEPA_EDITOR_FONT, "PEPA editor font", "2.1", new FontColorPair(new Font("monospaced", Font.PLAIN, 12), Color.black), "", "Font used in the PEPA model text editor." },
{ COLOUR_TYPE, MODEL_PEPA_EDITOR_BG_COLOUR, "PEPA editor background", "2.1", new Color(255,250,240), "", "Background colour for the PEPA model text editor." },
{ COLOUR_TYPE, MODEL_PEPA_EDITOR_COMMENT_COLOUR, "PEPA editor comment colour", "2.1", new Color(0,99,0), "", "Syntax highlighting colour for comments in the PEPA model text editor." },
{ CHOICE_TYPE, MODEL_PEPA_EDITOR_COMMENT_STYLE, "PEPA editor comment style", "2.1", "Italic", "Plain,Italic,Bold,Bold Italic", "Syntax highlighting style for comments in the PEPA model text editor." }
},
{
{ FONT_COLOUR_TYPE, PROPERTIES_FONT, "Display font", "2.1", new FontColorPair(new Font("monospaced", Font.PLAIN, 12), Color.black), "", "Font used for the properties list." },
{ COLOUR_TYPE, PROPERTIES_WARNING_COLOUR, "Warning colour", "2.1", new Color(255,130,130), "", "Colour used to indicate that a property is invalid." },
{ CHOICE_TYPE, PROPERTIES_ADDITION_STRATEGY, "Property addition strategy", "2.1", "Warn when invalid", "Warn when invalid,Do not allow invalid", "How to deal with properties that are invalid." },
{ BOOLEAN_TYPE, PROPERTIES_CLEAR_LIST_ON_LOAD, "Clear list when load model", "2.1", new Boolean(true), "", "Clear the properties list whenever a new model is loaded." }
},
{
{ INTEGER_TYPE, SIMULATOR_DEFAULT_NUM_SAMPLES, "Default number of samples", "4.0", new Integer(1000), "1,",
"Default number of samples when using approximate (simulation-based) model checking (CI/ACI/APMC methods)." },
@ -300,6 +274,32 @@ public class PrismSettings implements Observer
{ FILE_TYPE, SIMULATOR_NETWORK_FILE, "Network profile", "2.1", new File(""), "",
"File specifying the network profile used by the distributed PRISM simulator." }
},
{
{ BOOLEAN_TYPE, MODEL_AUTO_PARSE, "Auto parse", "2.1", new Boolean(true), "", "Parse PRISM models automatically as they are loaded/edited in the text editor." },
{ BOOLEAN_TYPE, MODEL_AUTO_MANUAL, "Manual parse for large models", "2.1", new Boolean(true), "", "Disable automatic model parsing when loading large PRISM models." },
{ INTEGER_TYPE, MODEL_PARSE_DELAY, "Parse delay (ms)", "2.1", new Integer(1000), "0,", "Time delay (after typing has finished) before an automatic re-parse of the model is performed." },
{ FONT_COLOUR_TYPE, MODEL_PRISM_EDITOR_FONT, "PRISM editor font", "2.1", new FontColorPair(new Font("monospaced", Font.PLAIN, 12), Color.black), "", "Font used in the PRISM model text editor." },
{ BOOLEAN_TYPE, MODEL_SHOW_LINE_NUMBERS, "PRISM editor line numbers", "3.2", new Boolean(true), "", "Enable or disable line numbers in the PRISM model text editor" },
{ COLOUR_TYPE, MODEL_PRISM_EDITOR_BG_COLOUR, "PRISM editor background", "2.1", new Color(255,255,255), "", "Background colour for the PRISM model text editor." },
{ COLOUR_TYPE, MODEL_PRISM_EDITOR_NUMERIC_COLOUR, "PRISM editor numeric colour", "2.1", new Color(0,0,255), "", "Syntax highlighting colour for numerical values in the PRISM model text editor." },
{ CHOICE_TYPE, MODEL_PRISM_EDITOR_NUMERIC_STYLE, "PRISM editor numeric style", "2.1", "Plain", "Plain,Italic,Bold,Bold Italic", "Syntax highlighting style for numerical values in the PRISM model text editor." },
{ COLOUR_TYPE, MODEL_PRISM_EDITOR_IDENTIFIER_COLOUR, "PRISM editor identifier colour", "2.1", new Color(255,0,0), "", "Syntax highlighting colour for identifiers values in the PRISM model text editor" },
{ CHOICE_TYPE, MODEL_PRISM_EDITOR_IDENTIFIER_STYLE, "PRISM editor identifier style", "2.1", "Plain", "Plain,Italic,Bold,Bold Italic", "Syntax highlighting style for identifiers in the PRISM model text editor." },
{ COLOUR_TYPE, MODEL_PRISM_EDITOR_KEYWORD_COLOUR, "PRISM editor keyword colour", "2.1", new Color(0,0,0), "", "Syntax highlighting colour for keywords in the PRISM model text editor" },
{ CHOICE_TYPE, MODEL_PRISM_EDITOR_KEYWORD_STYLE, "PRISM editor keyword style", "2.1", "Bold", "Plain,Italic,Bold,Bold Italic", "Syntax highlighting style for keywords in the PRISM model text editor." },
{ COLOUR_TYPE, MODEL_PRISM_EDITOR_COMMENT_COLOUR, "PRISM editor comment colour", "2.1", new Color(0,99,0), "", "Syntax highlighting colour for comments in the PRISM model text editor." },
{ CHOICE_TYPE, MODEL_PRISM_EDITOR_COMMENT_STYLE, "PRISM editor comment style", "2.1", "Italic", "Plain,Italic,Bold,Bold Italic", "Syntax highlighting style for comments in the PRISM model text editor." },
{ FONT_COLOUR_TYPE, MODEL_PEPA_EDITOR_FONT, "PEPA editor font", "2.1", new FontColorPair(new Font("monospaced", Font.PLAIN, 12), Color.black), "", "Font used in the PEPA model text editor." },
{ COLOUR_TYPE, MODEL_PEPA_EDITOR_BG_COLOUR, "PEPA editor background", "2.1", new Color(255,250,240), "", "Background colour for the PEPA model text editor." },
{ COLOUR_TYPE, MODEL_PEPA_EDITOR_COMMENT_COLOUR, "PEPA editor comment colour", "2.1", new Color(0,99,0), "", "Syntax highlighting colour for comments in the PEPA model text editor." },
{ CHOICE_TYPE, MODEL_PEPA_EDITOR_COMMENT_STYLE, "PEPA editor comment style", "2.1", "Italic", "Plain,Italic,Bold,Bold Italic", "Syntax highlighting style for comments in the PEPA model text editor." }
},
{
{ FONT_COLOUR_TYPE, PROPERTIES_FONT, "Display font", "2.1", new FontColorPair(new Font("monospaced", Font.PLAIN, 12), Color.black), "", "Font used for the properties list." },
{ COLOUR_TYPE, PROPERTIES_WARNING_COLOUR, "Warning colour", "2.1", new Color(255,130,130), "", "Colour used to indicate that a property is invalid." },
{ CHOICE_TYPE, PROPERTIES_ADDITION_STRATEGY, "Property addition strategy", "2.1", "Warn when invalid", "Warn when invalid,Do not allow invalid", "How to deal with properties that are invalid." },
{ BOOLEAN_TYPE, PROPERTIES_CLEAR_LIST_ON_LOAD, "Clear list when load model", "2.1", new Boolean(true), "", "Clear the properties list whenever a new model is loaded." }
},
{
{ FONT_COLOUR_TYPE, LOG_FONT, "Display font", "2.1", new FontColorPair(new Font("monospaced", Font.PLAIN, 12), Color.black), "", "Font used for the log display." },
{ COLOUR_TYPE, LOG_BG_COLOUR, "Background colour", "2.1", new Color(255,255,255), "", "Background colour for the log display." },

Loading…
Cancel
Save