s14h
/
prism-accumulation
1
0
Fork 0
Code Releases Activity
Browse Source

Added cumulative rewards as a feature of the simulator. 

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@176 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Mark Kattenbelt 20 years ago
parent
c08cb36e70
commit
0ab692970c
4 changed files with 198 additions and 253 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 147
      prism/src/userinterface/simulator/GUISimulator.form
  2. 281
      prism/src/userinterface/simulator/GUISimulator.java
  3. 16
      prism/src/userinterface/simulator/GUISimulatorPathTable.java
  4. 7
      prism/src/userinterface/simulator/GUIViewDialog.java

147
prism/src/userinterface/simulator/GUISimulator.form
View File

@ -847,20 +847,12 @@
<AuxValue name="JavaCodeGenerator_InitCodePost" type="java.lang.String" value="modelType.setFont(this.getFont().deriveFont(Font.BOLD));"/> <AuxValue name="JavaCodeGenerator_InitCodePost" type="java.lang.String" value="modelType.setFont(this.getFont().deriveFont(Font.BOLD));"/>
</AuxValues> </AuxValues>
</Component> </Component>
<Component class="javax.swing.JLabel" name="pathLength">
<Properties>
<Property name="text" type="java.lang.String" value="Path Length:"/>
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_InitCodePost" type="java.lang.String" value="pathLength.setFont(this.getFont().deriveFont(Font.BOLD));"/>
</AuxValues>
</Component>
<Component class="javax.swing.JLabel" name="totalTime">
<Component class="javax.swing.JLabel" name="definedConstants">
<Properties> <Properties>
<Property name="text" type="java.lang.String" value="Total Time:"/>
<Property name="text" type="java.lang.String" value="Defined Constants:"/>
</Properties> </Properties>
<AuxValues> <AuxValues>
<AuxValue name="JavaCodeGenerator_InitCodePost" type="java.lang.String" value="totalTime.setFont(this.getFont().deriveFont(Font.BOLD));"/>
<AuxValue name="JavaCodeGenerator_InitCodePost" type="java.lang.String" value="definedConstants.setFont(this.getFont().deriveFont(Font.BOLD));"/>
</AuxValues> </AuxValues>
</Component> </Component>
</SubComponents> </SubComponents>
@ -890,19 +882,9 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="pathLengthLabel">
<Properties>
<Property name="text" type="java.lang.String" value="0"/>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
<EmptyBorder bottom="0" left="10" right="0" top="0"/>
</Border>
</Property>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="totalTimeLabel">
<Component class="javax.swing.JLabel" name="definedConstantsLabel">
<Properties> <Properties>
<Property name="text" type="java.lang.String" value="0.0"/>
<Property name="text" type="java.lang.String" value="Unknown"/>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo"> <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
<EmptyBorder bottom="0" left="10" right="0" top="0"/> <EmptyBorder bottom="0" left="10" right="0" top="0"/>
@ -912,7 +894,7 @@
</Component> </Component>
</SubComponents> </SubComponents>
</Container> </Container>
<Container class="javax.swing.JPanel" name="middleLabels">
<Container class="javax.swing.JPanel" name="bottomLabels">
<Properties> <Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo"> <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
@ -927,33 +909,25 @@
<Property name="rows" type="int" value="1"/> <Property name="rows" type="int" value="1"/>
</Layout> </Layout>
<SubComponents> <SubComponents>
<Component class="javax.swing.JLabel" name="stateRewards">
<Properties>
<Property name="text" type="java.lang.String" value="State Rewards:"/>
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_InitCodePost" type="java.lang.String" value="stateRewards.setFont(this.getFont().deriveFont(Font.BOLD));"/>
</AuxValues>
</Component>
<Component class="javax.swing.JLabel" name="transitionRewards">
<Component class="javax.swing.JLabel" name="pathLength">
<Properties> <Properties>
<Property name="text" type="java.lang.String" value="Transition Rewards:"/>
<Property name="text" type="java.lang.String" value="Path Length:"/>
</Properties> </Properties>
<AuxValues> <AuxValues>
<AuxValue name="JavaCodeGenerator_InitCodePost" type="java.lang.String" value="transitionRewards.setFont(this.getFont().deriveFont(Font.BOLD));"/>
<AuxValue name="JavaCodeGenerator_InitCodePost" type="java.lang.String" value="pathLength.setFont(this.getFont().deriveFont(Font.BOLD));"/>
</AuxValues> </AuxValues>
</Component> </Component>
<Component class="javax.swing.JLabel" name="totalRewards">
<Component class="javax.swing.JLabel" name="totalTime">
<Properties> <Properties>
<Property name="text" type="java.lang.String" value="Total Reward:"/>
<Property name="text" type="java.lang.String" value="Total Time:"/>
</Properties> </Properties>
<AuxValues> <AuxValues>
<AuxValue name="JavaCodeGenerator_InitCodePost" type="java.lang.String" value="totalRewards.setFont(this.getFont().deriveFont(Font.BOLD));"/>
<AuxValue name="JavaCodeGenerator_InitCodePost" type="java.lang.String" value="totalTime.setFont(this.getFont().deriveFont(Font.BOLD));"/>
</AuxValues> </AuxValues>
</Component> </Component>
</SubComponents> </SubComponents>
</Container> </Container>
<Container class="javax.swing.JPanel" name="middleValues">
<Container class="javax.swing.JPanel" name="bottomValues">
<Properties> <Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo"> <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
@ -968,19 +942,9 @@
<Property name="rows" type="int" value="1"/> <Property name="rows" type="int" value="1"/>
</Layout> </Layout>
<SubComponents> <SubComponents>
<Component class="javax.swing.JLabel" name="stateRewardsLabel">
<Properties>
<Property name="text" type="java.lang.String" value="0.0"/>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
<EmptyBorder bottom="0" left="10" right="0" top="0"/>
</Border>
</Property>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="transitionRewardsLabel">
<Component class="javax.swing.JLabel" name="pathLengthLabel">
<Properties> <Properties>
<Property name="text" type="java.lang.String" value="0.0"/>
<Property name="text" type="java.lang.String" value="0"/>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo"> <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
<EmptyBorder bottom="0" left="10" right="0" top="0"/> <EmptyBorder bottom="0" left="10" right="0" top="0"/>
@ -988,7 +952,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="totalRewardLabel">
<Component class="javax.swing.JLabel" name="totalTimeLabel">
<Properties> <Properties>
<Property name="text" type="java.lang.String" value="0.0"/> <Property name="text" type="java.lang.String" value="0.0"/>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
@ -1000,58 +964,6 @@
</Component> </Component>
</SubComponents> </SubComponents>
</Container> </Container>
<Container class="javax.swing.JPanel" name="bottomLabels">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
<EmptyBorder bottom="0" left="5" right="5" top="5"/>
</Border>
</Property>
</Properties>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
<Property name="columns" type="int" value="3"/>
<Property name="horizontalGap" type="int" value="5"/>
<Property name="rows" type="int" value="1"/>
</Layout>
<SubComponents>
<Component class="javax.swing.JLabel" name="definedConstants">
<Properties>
<Property name="text" type="java.lang.String" value="Defined Constants:"/>
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_InitCodePost" type="java.lang.String" value="definedConstants.setFont(this.getFont().deriveFont(Font.BOLD));"/>
</AuxValues>
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="bottomValues">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
<EmptyBorder bottom="5" left="5" right="5" top="0"/>
</Border>
</Property>
</Properties>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
<Property name="columns" type="int" value="3"/>
<Property name="horizontalGap" type="int" value="5"/>
<Property name="rows" type="int" value="1"/>
</Layout>
<SubComponents>
<Component class="javax.swing.JLabel" name="definedConstantsLabel">
<Properties>
<Property name="text" type="java.lang.String" value="Unknown"/>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
<EmptyBorder bottom="0" left="10" right="0" top="0"/>
</Border>
</Property>
</Properties>
</Component>
</SubComponents>
</Container>
</SubComponents> </SubComponents>
</Container> </Container>
</SubComponents> </SubComponents>
@ -1073,9 +985,9 @@
</Constraints> </Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout"> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
<Property name="columns" type="int" value="1"/>
<Property name="horizontalGap" type="int" value="5"/>
<Property name="rows" type="int" value="3"/>
<Property name="columns" type="int" value="2"/>
<Property name="horizontalGap" type="int" value="10"/>
<Property name="rows" type="int" value="2"/>
<Property name="verticalGap" type="int" value="10"/> <Property name="verticalGap" type="int" value="10"/>
</Layout> </Layout>
<SubComponents> <SubComponents>
@ -1139,6 +1051,27 @@
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/> <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
</AuxValues> </AuxValues>
</Component> </Component>
<Component class="javax.swing.JButton" name="configureViewButton">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="2" name=""/>
</Property>
<Property name="toolTipText" type="java.lang.String" value="Export Path"/>
<Property name="actionCommand" type="java.lang.String" value="Configure View"/>
<Property name="horizontalAlignment" type="int" value="10"/>
<Property name="label" type="java.lang.String" value="Configure View"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[119, 28]"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="configureViewButtonActionPerformed"/>
</Events>
<AuxValues>
<AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
</AuxValues>
</Component>
</SubComponents> </SubComponents>
</Container> </Container>
</SubComponents> </SubComponents>

281
prism/src/userinterface/simulator/GUISimulator.java
View File

@ -85,6 +85,7 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
newPathButton.setIcon(new ImageIcon(this.getClass().getResource("/images/smallNewPath.gif"))); newPathButton.setIcon(new ImageIcon(this.getClass().getResource("/images/smallNewPath.gif")));
resetPathButton.setIcon(new ImageIcon(this.getClass().getResource("/images/smallResetPath.gif"))); resetPathButton.setIcon(new ImageIcon(this.getClass().getResource("/images/smallResetPath.gif")));
exportPathButton.setIcon(new ImageIcon(this.getClass().getResource("/images/smallExport.gif"))); exportPathButton.setIcon(new ImageIcon(this.getClass().getResource("/images/smallExport.gif")));
configureViewButton.setIcon(new ImageIcon(this.getClass().getResource("/images/smallFind.gif")));
autoUpdateButton.setIcon(new ImageIcon(this.getClass().getResource("/images/smallAutomaticUpdate.gif"))); autoUpdateButton.setIcon(new ImageIcon(this.getClass().getResource("/images/smallAutomaticUpdate.gif")));
manualUpdateField.setIcon(new ImageIcon(this.getClass().getResource("/images/smallManualUpdate.gif"))); manualUpdateField.setIcon(new ImageIcon(this.getClass().getResource("/images/smallManualUpdate.gif")));
@ -153,8 +154,7 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
modelTypeLabel.setText("Unknown"); modelTypeLabel.setText("Unknown");
totalTimeLabel.setText("0.0"); totalTimeLabel.setText("0.0");
pathLengthLabel.setText("0");
totalRewardLabel.setText("");
pathLengthLabel.setText("0");
txtFilter = new GUIPrismFileFilter[1]; txtFilter = new GUIPrismFileFilter[1];
txtFilter[0] = new GUIPrismFileFilter("Text files (*.txt)"); txtFilter[0] = new GUIPrismFileFilter("Text files (*.txt)");
@ -393,9 +393,6 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
totalTimeLabel.setText(""+engine.getTotalPathTime()); totalTimeLabel.setText(""+engine.getTotalPathTime());
pathLengthLabel.setText(""+(engine.getPathSize()-1)); pathLengthLabel.setText(""+(engine.getPathSize()-1));
totalRewardLabel.setText(getTotalRewardLabelString());
stateRewardsLabel.setText(getTotalStateRewardLabelString());
transitionRewardsLabel.setText(getTotalTransitionRewardLabelString());
definedConstantsLabel.setText((uCon.getDefinedConstantsString().length() == 0) ? "None" : uCon.getDefinedConstantsString()); definedConstantsLabel.setText((uCon.getDefinedConstantsString().length() == 0) ? "None" : uCon.getDefinedConstantsString());
doEnables(); doEnables();
@ -456,9 +453,6 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
totalTimeLabel.setText(""+engine.getTotalPathTime()); totalTimeLabel.setText(""+engine.getTotalPathTime());
pathLengthLabel.setText(""+(engine.getPathSize()-1)); pathLengthLabel.setText(""+(engine.getPathSize()-1));
totalRewardLabel.setText(getTotalRewardLabelString());
stateRewardsLabel.setText(getTotalStateRewardLabelString());
transitionRewardsLabel.setText(getTotalTransitionRewardLabelString());
stateLabelList.repaint(); stateLabelList.repaint();
pathFormulaeList.repaint(); pathFormulaeList.repaint();
@ -505,9 +499,6 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
totalTimeLabel.setText(""+engine.getTotalPathTime()); totalTimeLabel.setText(""+engine.getTotalPathTime());
pathLengthLabel.setText(""+(engine.getPathSize()-1)); pathLengthLabel.setText(""+(engine.getPathSize()-1));
totalRewardLabel.setText(getTotalRewardLabelString());
stateRewardsLabel.setText(getTotalStateRewardLabelString());
transitionRewardsLabel.setText(getTotalTransitionRewardLabelString());
stateLabelList.repaint(); stateLabelList.repaint();
pathFormulaeList.repaint(); pathFormulaeList.repaint();
setComputing(false); setComputing(false);
@ -526,9 +517,6 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
totalTimeLabel.setText(""+engine.getTotalPathTime()); totalTimeLabel.setText(""+engine.getTotalPathTime());
pathLengthLabel.setText(""+(engine.getPathSize()-1)); pathLengthLabel.setText(""+(engine.getPathSize()-1));
totalRewardLabel.setText(getTotalRewardLabelString());
stateRewardsLabel.setText(getTotalStateRewardLabelString());
transitionRewardsLabel.setText(getTotalTransitionRewardLabelString());
stateLabelList.repaint(); stateLabelList.repaint();
pathFormulaeList.repaint(); pathFormulaeList.repaint();
setComputing(false); setComputing(false);
@ -587,9 +575,6 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
totalTimeLabel.setText(""+engine.getTotalPathTime()); totalTimeLabel.setText(""+engine.getTotalPathTime());
pathLengthLabel.setText(""+(engine.getPathSize()-1)); pathLengthLabel.setText(""+(engine.getPathSize()-1));
totalRewardLabel.setText(getTotalRewardLabelString());
stateRewardsLabel.setText(getTotalStateRewardLabelString());
transitionRewardsLabel.setText(getTotalTransitionRewardLabelString());
stateLabelList.repaint(); stateLabelList.repaint();
pathFormulaeList.repaint(); pathFormulaeList.repaint();
setComputing(false); setComputing(false);
@ -632,9 +617,6 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
totalTimeLabel.setText(""+engine.getTotalPathTime()); totalTimeLabel.setText(""+engine.getTotalPathTime());
pathLengthLabel.setText(""+(engine.getPathSize()-1)); pathLengthLabel.setText(""+(engine.getPathSize()-1));
totalRewardLabel.setText(getTotalRewardLabelString());
stateRewardsLabel.setText(getTotalStateRewardLabelString());
transitionRewardsLabel.setText(getTotalTransitionRewardLabelString());
setComputing(false); setComputing(false);
@ -652,9 +634,6 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
totalTimeLabel.setText(""+engine.getTotalPathTime()); totalTimeLabel.setText(""+engine.getTotalPathTime());
pathLengthLabel.setText(""+(engine.getPathSize()-1)); pathLengthLabel.setText(""+(engine.getPathSize()-1));
totalRewardLabel.setText(getTotalRewardLabelString());
stateRewardsLabel.setText(getTotalStateRewardLabelString());
transitionRewardsLabel.setText(getTotalTransitionRewardLabelString());
pathTable.scrollRectToVisible(new Rectangle(0, (int)pathTable.getPreferredSize().getHeight() - 10, (int)pathTable.getPreferredSize().getWidth(), (int)pathTable.getPreferredSize().getHeight()) ); pathTable.scrollRectToVisible(new Rectangle(0, (int)pathTable.getPreferredSize().getHeight() - 10, (int)pathTable.getPreferredSize().getWidth(), (int)pathTable.getPreferredSize().getHeight()) );
@ -900,6 +879,7 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
resetPathButton.setEnabled(pathActive && !computing); resetPathButton.setEnabled(pathActive && !computing);
exportPathButton.setEnabled(pathActive && !computing); exportPathButton.setEnabled(pathActive && !computing);
configureViewButton.setEnabled(pathActive && !computing);
newPathButton.setEnabled(mf != null && !computing); newPathButton.setEnabled(mf != null && !computing);
@ -913,16 +893,7 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
pathLength.setEnabled(pathActive); pathLength.setEnabled(pathActive);
pathLengthLabel.setEnabled(pathActive); pathLengthLabel.setEnabled(pathActive);
totalRewards.setEnabled(pathActive);
totalRewardLabel.setEnabled(pathActive);
stateRewards.setEnabled(pathActive);
stateRewardsLabel.setEnabled(pathActive);
transitionRewards.setEnabled(pathActive);
transitionRewardsLabel.setEnabled(pathActive);
definedConstants.setEnabled(pathActive); definedConstants.setEnabled(pathActive);
definedConstantsLabel.setEnabled(pathActive); definedConstantsLabel.setEnabled(pathActive);
@ -1000,29 +971,22 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
innerInformationPanel = new javax.swing.JPanel(); innerInformationPanel = new javax.swing.JPanel();
topLabels = new javax.swing.JPanel(); topLabels = new javax.swing.JPanel();
modelType = new javax.swing.JLabel(); modelType = new javax.swing.JLabel();
pathLength = new javax.swing.JLabel();
totalTime = new javax.swing.JLabel();
definedConstants = new javax.swing.JLabel();
topValues = new javax.swing.JPanel(); topValues = new javax.swing.JPanel();
modelTypeLabel = new javax.swing.JLabel(); modelTypeLabel = new javax.swing.JLabel();
pathLengthLabel = new javax.swing.JLabel();
totalTimeLabel = new javax.swing.JLabel();
middleLabels = new javax.swing.JPanel();
stateRewards = new javax.swing.JLabel();
transitionRewards = new javax.swing.JLabel();
totalRewards = new javax.swing.JLabel();
middleValues = new javax.swing.JPanel();
stateRewardsLabel = new javax.swing.JLabel();
transitionRewardsLabel = new javax.swing.JLabel();
totalRewardLabel = new javax.swing.JLabel();
definedConstantsLabel = new javax.swing.JLabel();
bottomLabels = new javax.swing.JPanel(); bottomLabels = new javax.swing.JPanel();
definedConstants = new javax.swing.JLabel();
pathLength = new javax.swing.JLabel();
totalTime = new javax.swing.JLabel();
bottomValues = new javax.swing.JPanel(); bottomValues = new javax.swing.JPanel();
definedConstantsLabel = new javax.swing.JLabel();
pathLengthLabel = new javax.swing.JLabel();
totalTimeLabel = new javax.swing.JLabel();
buttonPanel = new javax.swing.JPanel(); buttonPanel = new javax.swing.JPanel();
innerButtonPanel = new javax.swing.JPanel(); innerButtonPanel = new javax.swing.JPanel();
newPathButton = new javax.swing.JButton(); newPathButton = new javax.swing.JButton();
resetPathButton = new javax.swing.JButton(); resetPathButton = new javax.swing.JButton();
exportPathButton = new javax.swing.JButton(); exportPathButton = new javax.swing.JButton();
configureViewButton = new javax.swing.JButton();
tablePanel = new javax.swing.JPanel(); tablePanel = new javax.swing.JPanel();
tableScroll = new javax.swing.JScrollPane(); tableScroll = new javax.swing.JScrollPane();
pathTable = new javax.swing.JTable(); pathTable = new javax.swing.JTable();
@ -1439,13 +1403,9 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
modelType.setFont(this.getFont().deriveFont(Font.BOLD)); modelType.setFont(this.getFont().deriveFont(Font.BOLD));
topLabels.add(modelType); topLabels.add(modelType);
pathLength.setText("Path Length:");
pathLength.setFont(this.getFont().deriveFont(Font.BOLD));
topLabels.add(pathLength);
totalTime.setText("Total Time:");
totalTime.setFont(this.getFont().deriveFont(Font.BOLD));
topLabels.add(totalTime);
definedConstants.setText("Defined Constants:");
definedConstants.setFont(this.getFont().deriveFont(Font.BOLD));
topLabels.add(definedConstants);
innerInformationPanel.add(topLabels); innerInformationPanel.add(topLabels);
@ -1456,65 +1416,35 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
modelTypeLabel.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 10, 0, 0)); modelTypeLabel.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 10, 0, 0));
topValues.add(modelTypeLabel); topValues.add(modelTypeLabel);
pathLengthLabel.setText("0");
pathLengthLabel.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 10, 0, 0));
topValues.add(pathLengthLabel);
totalTimeLabel.setText("0.0");
totalTimeLabel.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 10, 0, 0));
topValues.add(totalTimeLabel);
definedConstantsLabel.setText("Unknown");
definedConstantsLabel.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 10, 0, 0));
topValues.add(definedConstantsLabel);
innerInformationPanel.add(topValues); innerInformationPanel.add(topValues);
middleLabels.setLayout(new java.awt.GridLayout(1, 3, 5, 0));
middleLabels.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 0, 5));
stateRewards.setText("State Rewards:");
stateRewards.setFont(this.getFont().deriveFont(Font.BOLD));
middleLabels.add(stateRewards);
transitionRewards.setText("Transition Rewards:");
transitionRewards.setFont(this.getFont().deriveFont(Font.BOLD));
middleLabels.add(transitionRewards);
totalRewards.setText("Total Reward:");
totalRewards.setFont(this.getFont().deriveFont(Font.BOLD));
middleLabels.add(totalRewards);
innerInformationPanel.add(middleLabels);
middleValues.setLayout(new java.awt.GridLayout(1, 3, 5, 0));
middleValues.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 5, 5, 5));
stateRewardsLabel.setText("0.0");
stateRewardsLabel.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 10, 0, 0));
middleValues.add(stateRewardsLabel);
transitionRewardsLabel.setText("0.0");
transitionRewardsLabel.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 10, 0, 0));
middleValues.add(transitionRewardsLabel);
totalRewardLabel.setText("0.0");
totalRewardLabel.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 10, 0, 0));
middleValues.add(totalRewardLabel);
innerInformationPanel.add(middleValues);
bottomLabels.setLayout(new java.awt.GridLayout(1, 3, 5, 0)); bottomLabels.setLayout(new java.awt.GridLayout(1, 3, 5, 0));
bottomLabels.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 0, 5)); bottomLabels.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 0, 5));
definedConstants.setText("Defined Constants:");
definedConstants.setFont(this.getFont().deriveFont(Font.BOLD));
bottomLabels.add(definedConstants);
pathLength.setText("Path Length:");
pathLength.setFont(this.getFont().deriveFont(Font.BOLD));
bottomLabels.add(pathLength);
totalTime.setText("Total Time:");
totalTime.setFont(this.getFont().deriveFont(Font.BOLD));
bottomLabels.add(totalTime);
innerInformationPanel.add(bottomLabels); innerInformationPanel.add(bottomLabels);
bottomValues.setLayout(new java.awt.GridLayout(1, 3, 5, 0)); bottomValues.setLayout(new java.awt.GridLayout(1, 3, 5, 0));
bottomValues.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 5, 5, 5)); bottomValues.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 5, 5, 5));
definedConstantsLabel.setText("Unknown");
definedConstantsLabel.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 10, 0, 0));
bottomValues.add(definedConstantsLabel);
pathLengthLabel.setText("0");
pathLengthLabel.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 10, 0, 0));
bottomValues.add(pathLengthLabel);
totalTimeLabel.setText("0.0");
totalTimeLabel.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 10, 0, 0));
bottomValues.add(totalTimeLabel);
innerInformationPanel.add(bottomValues); innerInformationPanel.add(bottomValues);
@ -1524,7 +1454,7 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
buttonPanel.setLayout(new java.awt.BorderLayout()); buttonPanel.setLayout(new java.awt.BorderLayout());
innerButtonPanel.setLayout(new java.awt.GridLayout(3, 1, 5, 10));
innerButtonPanel.setLayout(new java.awt.GridLayout(2, 2, 10, 10));
newPathButton.setIcon(new javax.swing.ImageIcon("")); newPathButton.setIcon(new javax.swing.ImageIcon(""));
newPathButton.setText("New Path"); newPathButton.setText("New Path");
@ -1565,6 +1495,20 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
innerButtonPanel.add(exportPathButton); innerButtonPanel.add(exportPathButton);
configureViewButton.setIcon(new javax.swing.ImageIcon(""));
configureViewButton.setToolTipText("Configure View");
configureViewButton.setActionCommand("Configure View");
configureViewButton.setHorizontalAlignment(javax.swing.SwingConstants.LEADING);
configureViewButton.setLabel("Configure View");
configureViewButton.setPreferredSize(new java.awt.Dimension(119, 28));
configureViewButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
configureViewButtonActionPerformed(evt);
}
});
innerButtonPanel.add(configureViewButton);
buttonPanel.add(innerButtonPanel, java.awt.BorderLayout.NORTH); buttonPanel.add(innerButtonPanel, java.awt.BorderLayout.NORTH);
topRightPanel.add(buttonPanel, java.awt.BorderLayout.WEST); topRightPanel.add(buttonPanel, java.awt.BorderLayout.WEST);
@ -1595,6 +1539,10 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
}// </editor-fold>//GEN-END:initComponents }// </editor-fold>//GEN-END:initComponents
private void configureViewButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_configureViewButtonActionPerformed
a_configureView();
}//GEN-LAST:event_configureViewButtonActionPerformed
private void autoTimeCheckStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_autoTimeCheckStateChanged private void autoTimeCheckStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_autoTimeCheckStateChanged
this.stateTimeField.setEnabled(!autoTimeCheck.isSelected()); this.stateTimeField.setEnabled(!autoTimeCheck.isSelected());
@ -1825,7 +1773,7 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
newPath.setEnabled(newPathButton.isEnabled()); newPath.setEnabled(newPathButton.isEnabled());
resetPath.setEnabled(resetPathButton.isEnabled()); resetPath.setEnabled(resetPathButton.isEnabled());
exportPath.setEnabled(exportPathButton.isEnabled()); exportPath.setEnabled(exportPathButton.isEnabled());
configureView.setEnabled(pathActive);
configureView.setEnabled(configureViewButton.isEnabled());
int index = pathTable.rowAtPoint(e.getPoint()); int index = pathTable.rowAtPoint(e.getPoint());
@ -2064,6 +2012,7 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
private javax.swing.JPanel bottomValues; private javax.swing.JPanel bottomValues;
private javax.swing.ButtonGroup buttonGroup1; private javax.swing.ButtonGroup buttonGroup1;
private javax.swing.JPanel buttonPanel; private javax.swing.JPanel buttonPanel;
private javax.swing.JButton configureViewButton;
javax.swing.JTable currentUpdatesTable; javax.swing.JTable currentUpdatesTable;
private javax.swing.JLabel definedConstants; private javax.swing.JLabel definedConstants;
private javax.swing.JLabel definedConstantsLabel; private javax.swing.JLabel definedConstantsLabel;
@ -2107,8 +2056,6 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
private javax.swing.JSplitPane jSplitPane3; private javax.swing.JSplitPane jSplitPane3;
private javax.swing.JPanel leftPanel; private javax.swing.JPanel leftPanel;
javax.swing.JButton manualUpdateField; javax.swing.JButton manualUpdateField;
private javax.swing.JPanel middleLabels;
private javax.swing.JPanel middleValues;
private javax.swing.JLabel modelType; private javax.swing.JLabel modelType;
private javax.swing.JLabel modelTypeLabel; private javax.swing.JLabel modelTypeLabel;
javax.swing.JButton newPathButton; javax.swing.JButton newPathButton;
@ -2123,8 +2070,6 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
javax.swing.JButton resetPathButton; javax.swing.JButton resetPathButton;
private javax.swing.JPanel rightPanel; private javax.swing.JPanel rightPanel;
private javax.swing.JList stateLabelList; private javax.swing.JList stateLabelList;
private javax.swing.JLabel stateRewards;
private javax.swing.JLabel stateRewardsLabel;
javax.swing.JTextField stateTimeField; javax.swing.JTextField stateTimeField;
private javax.swing.JPanel tablePanel; private javax.swing.JPanel tablePanel;
private javax.swing.JScrollPane tableScroll; private javax.swing.JScrollPane tableScroll;
@ -2133,12 +2078,8 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
private javax.swing.JPanel topRightPanel; private javax.swing.JPanel topRightPanel;
private javax.swing.JPanel topSplit; private javax.swing.JPanel topSplit;
private javax.swing.JPanel topValues; private javax.swing.JPanel topValues;
private javax.swing.JLabel totalRewardLabel;
private javax.swing.JLabel totalRewards;
private javax.swing.JLabel totalTime; private javax.swing.JLabel totalTime;
private javax.swing.JLabel totalTimeLabel; private javax.swing.JLabel totalTimeLabel;
private javax.swing.JLabel transitionRewards;
private javax.swing.JLabel transitionRewardsLabel;
private javax.swing.JScrollPane updatesScroll; private javax.swing.JScrollPane updatesScroll;
private javax.swing.JSplitPane verticalSplit; private javax.swing.JSplitPane verticalSplit;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
@ -2186,6 +2127,45 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
} }
} }
public class CumulativeRewardStructure extends RewardStructure
{
public CumulativeRewardStructure(int index, String name, boolean stateEmpty, boolean transitionEmpty)
{
super(index, name, stateEmpty, transitionEmpty);
}
public String toString()
{
String str = super.toString();
str += " (cumulative)";
return str;
}
public boolean isCumulative()
{
return true;
}
public String getColumnName()
{
String str = super.getColumnName();
str += " (+)";
return str;
}
public Object getValue(int stateIndex, boolean lastState)
{
// The cumulative reward seems for transitions seems to be wrong.
if (lastState)
return new String("...");
else
{
Double value = new Double(SimulatorEngine.getTotalStateRewardOfPathState(stateIndex, super.index) + ((stateIndex == 0) ? 0.0 : SimulatorEngine.getTotalTransitionRewardOfPathState(stateIndex-1, super.index)));
return value;
}
}
}
/** /**
* @author mxk * @author mxk
* Represents a in the model. * Represents a in the model.
@ -2216,6 +2196,18 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
return name; return name;
} }
public String getColumnName()
{
if (name == null)
{
return "" + (index + 1);
}
else
{
return "\"" + name + "\"";
}
}
public boolean isStateEmpty() public boolean isStateEmpty()
{ {
return stateEmpty; return stateEmpty;
@ -2225,6 +2217,11 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
{ {
return transitionEmpty; return transitionEmpty;
} }
public boolean isCumulative()
{
return false;
}
public String toString() public String toString()
{ {
@ -2238,11 +2235,19 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
} }
} }
public Object getValue(int stateIndex, boolean lastState)
{
RewardStructureValue value = new RewardStructureValue(this, SimulatorEngine.getStateRewardOfPathState(stateIndex, index), SimulatorEngine.getTransitionRewardOfPathState(stateIndex, index));
if (lastState)
value.setTransitionRewardUnknown(true);
return value;
}
public boolean equals(Object o) public boolean equals(Object o)
{ {
return (o instanceof RewardStructure && ((RewardStructure)o).getIndex() == index);
return (o instanceof RewardStructure && ((RewardStructure)o).getIndex() == index && ((RewardStructure)o).isCumulative() == isCumulative());
} }
}
}
public class RewardStructureValue public class RewardStructureValue
{ {
@ -2251,6 +2256,7 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
private Double stateReward; private Double stateReward;
private Double transitionReward; private Double transitionReward;
private boolean stateRewardUnknown;
private boolean transitionRewardUnknown; private boolean transitionRewardUnknown;
private boolean stateRewardVisible; private boolean stateRewardVisible;
@ -2261,7 +2267,9 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
this.rewardStructure = rewardStructure; this.rewardStructure = rewardStructure;
this.stateReward = stateReward; this.stateReward = stateReward;
this.transitionReward = transitionReward; this.transitionReward = transitionReward;
this.transitionRewardUnknown = false; this.transitionRewardUnknown = false;
this.stateRewardUnknown = false;
this.stateRewardVisible = true; this.stateRewardVisible = true;
this.transitionRewardVisible = true; this.transitionRewardVisible = true;
@ -2308,15 +2316,25 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
return this.transitionRewardVisible; return this.transitionRewardVisible;
} }
public void setTransitionRewardUnknown()
public void setStateRewardUnknown(boolean unknown)
{ {
this.transitionRewardUnknown = true;
this.stateRewardUnknown = unknown;
}
public void setTransitionRewardUnknown(boolean unknown)
{
this.transitionRewardUnknown = unknown;
} }
public boolean isTransitionRewardUnknown() public boolean isTransitionRewardUnknown()
{ {
return this.transitionRewardUnknown; return this.transitionRewardUnknown;
} }
public boolean isStateRewardUnknown()
{
return this.stateRewardUnknown;
}
} }
public class SimulationView extends Observable public class SimulationView extends Observable
@ -2452,6 +2470,7 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
if (rewardName.trim().length() == 0) if (rewardName.trim().length() == 0)
{ rewardName = null; } { rewardName = null; }
visibleRewards.add(new RewardStructure(r, rewardName, mf.getRewardStruct(r).getNumStateItems() == 0, mf.getRewardStruct(r).getNumTransItems() == 0)); visibleRewards.add(new RewardStructure(r, rewardName, mf.getRewardStruct(r).getNumStateItems() == 0, mf.getRewardStruct(r).getNumTransItems() == 0));
hiddenRewards.add(new CumulativeRewardStructure(r, rewardName, mf.getRewardStruct(r).getNumStateItems() == 0, mf.getRewardStruct(r).getNumTransItems() == 0));
} }
} }
catch (SimulatorException e) {} catch (SimulatorException e) {}
@ -2678,12 +2697,7 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
} }
else if (rewardStart <= columnIndex) else if (rewardStart <= columnIndex)
{ {
String rewardStructName = ((RewardStructure)view.getVisibleRewards().get(columnIndex - rewardStart)).getName();
if (rewardStructName != null)
{
return "\"" + rewardStructName + "\"";
}
else return "" + (((RewardStructure)view.getVisibleRewards().get(columnIndex - rewardStart)).getIndex() + 1);
return ((RewardStructure)view.getVisibleRewards().get(columnIndex - rewardStart)).getColumnName();
} }
} }
return "Undefined Column"; return "Undefined Column";
@ -2731,24 +2745,19 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
} }
else if (rewardStart <= columnIndex) else if (rewardStart <= columnIndex)
{ {
RewardStructure reward = (RewardStructure)view.getVisibleRewards().get(columnIndex - rewardStart);
if (rowIndex == SimulatorEngine.getPathSize() - 1)
{
RewardStructureValue value = new RewardStructureValue(reward, SimulatorEngine.getStateRewardOfPathState(rowIndex, reward.getIndex()), SimulatorEngine.getTransitionRewardOfPathState(rowIndex, reward.getIndex()));
value.setTransitionRewardUnknown();
value.setStateRewardVisible(!(reward.isStateEmpty() && view.hideEmptyRewards()));
value.setTransitionRewardVisible(!(reward.isTransitionEmpty() && view.hideEmptyRewards()));
return value;
}
else if (rowIndex < SimulatorEngine.getPathSize() - 1)
RewardStructure reward = (RewardStructure)view.getVisibleRewards().get(columnIndex - rewardStart);
Object objValue = reward.getValue(rowIndex, (rowIndex == SimulatorEngine.getPathSize() - 1));
if (objValue instanceof RewardStructureValue)
{ {
RewardStructureValue value = new RewardStructureValue(reward, SimulatorEngine.getStateRewardOfPathState(rowIndex, reward.getIndex()), SimulatorEngine.getTransitionRewardOfPathState(rowIndex, reward.getIndex()));
RewardStructureValue value = (RewardStructureValue)reward.getValue(rowIndex, (rowIndex == SimulatorEngine.getPathSize() - 1));
value.setStateRewardVisible(!(reward.isStateEmpty() && view.hideEmptyRewards())); value.setStateRewardVisible(!(reward.isStateEmpty() && view.hideEmptyRewards()));
value.setTransitionRewardVisible(!(reward.isTransitionEmpty() && view.hideEmptyRewards())); value.setTransitionRewardVisible(!(reward.isTransitionEmpty() && view.hideEmptyRewards()));
return value;
}
}
return objValue;
} }
} }
} }

16
prism/src/userinterface/simulator/GUISimulatorPathTable.java
View File

@ -389,7 +389,7 @@ public class GUISimulatorPathTable extends GUIGroupedTable
if (rewardValue.isStateRewardVisible()) if (rewardValue.isStateRewardVisible())
{ {
text += rewardValue.getStateReward().toString();
text += (rewardValue.isStateRewardUnknown()) ? "..." : rewardValue.getStateReward().toString();
tooltipText += "State reward"; tooltipText += "State reward";
} }
@ -405,14 +405,12 @@ public class GUISimulatorPathTable extends GUIGroupedTable
text += (rewardValue.isTransitionRewardUnknown()) ? "..." : rewardValue.getTransitionReward().toString(); text += (rewardValue.isTransitionRewardUnknown()) ? "..." : rewardValue.getTransitionReward().toString();
text += " ]"; text += " ]";
if (rewardValue.isTransitionRewardUnknown())
{
tooltipText = "The transition reward is still unknown";
}
else
{
tooltipText += "[ Transition reward ]";
}
tooltipText += "[ " + (rewardValue.isStateRewardVisible() ? "t" : "T") + "ransition reward ]";
}
if (rewardValue.isStateRewardUnknown() || rewardValue.isTransitionRewardUnknown())
{
tooltipText += "Some rewards values have yet to be determined ";
} }
field.setText(text); field.setText(text);

7
prism/src/userinterface/simulator/GUIViewDialog.java
View File

@ -701,7 +701,12 @@ public class GUIViewDialog extends JDialog implements KeyListener
while (i < super.getSize() && ((GUISimulator.RewardStructure)super.getElementAt(i)).getIndex() < reward.getIndex()) while (i < super.getSize() && ((GUISimulator.RewardStructure)super.getElementAt(i)).getIndex() < reward.getIndex())
{ {
i++; i++;
}
}
if (i < super.getSize() && ((GUISimulator.RewardStructure)super.getElementAt(i)).getIndex() == reward.getIndex() && reward.isCumulative())
{
i++;
}
super.add(i, reward); super.add(i, reward);
} }

Write Preview
Loading…
Cancel
Save