@@ -109,6 +109,30 @@ public MainFrame() throws IOException {
109109 // Exception bearbeiten
110110 }
111111
112+ //Install default scpn file
113+ File defaultSCPN = new File (support .NAME_OF_DEFAULT_SCPN );
114+ if (!defaultSCPN .exists () || !defaultSCPN .isFile ()) {
115+ try {
116+ InputStream ddlStream = this .getClass ().getClassLoader ().getResourceAsStream ("toe/default_SCPN.xml" );
117+ FileOutputStream fos = null ;
118+ try {
119+ fos = new FileOutputStream (support .NAME_OF_DEFAULT_SCPN );
120+ byte [] buf = new byte [2048 ];
121+ int r = ddlStream .read (buf );
122+ while (r != -1 ) {
123+ fos .write (buf , 0 , r );
124+ r = ddlStream .read (buf );
125+ }
126+ } finally {
127+ if (fos != null ) {
128+ fos .close ();
129+ }
130+ }
131+ } catch (IOException e ) {
132+ support .log ("Failed to install default SCPN" , typeOfLogLevel .ERROR );
133+ }
134+ }
135+
112136 jButtonPathToTimeNet .setBackground (Color .GRAY );
113137 jButtonPathToTimeNet .setText ("Enter Path To TimeNet" );
114138
@@ -121,7 +145,7 @@ public MainFrame() throws IOException {
121145 pMaxTime .initWithValues ("MaxTime" , 0 , 0 , 1 );
122146 pMaxError .initWithValues ("MaxError" , 5 , 5 , 1 );
123147
124- this .jTextFieldSCPNFile .setText (auto .getProperty ("file" ));
148+ this .jTextFieldSCPNFile .setText (auto .getProperty ("file" , support . NAME_OF_DEFAULT_SCPN ));
125149 //this.jTextFieldPathToTimeNet.setText(auto.getProperty("timenetpath"));
126150 this .setPathToTimeNet (auto .getProperty ("timenetpath" , "" ));
127151 //support.log("Read Path to TimeNet:"+auto.getProperty("timenetpath"));
@@ -1077,48 +1101,46 @@ private void jButtonStartOptimizationActionPerformed(java.awt.event.ActionEvent
10771101 if (this .sizeOfDesignSpace <= support .DEFAULT_MINIMUM_DESIGNSPACE_FOR_OPTIMIZATION ) {
10781102 support .log ("Design space to small, no Optimization posible." , typeOfLogLevel .INFO );
10791103 support .setStatusText ("Designspace to small for Opti." );
1080- } else {
1081- if (this .getListOfActiveMeasureMentsToOptimize ().size () >= 1 ) {
1082- this .switchUIState (uiState .processRunning );
1083- //Ask for Tmp-Path
1084- String tPath = (support .getPathToDirByDialog ("Dir for export TMP-Files and log.\n " , support .getTmpPath ()));
1085- //if tmpPath is empty or null --> return
1086- if (tPath != null ) {
1087- support .setTmpPath (tPath );
1088- this .saveProperties ();
1089- support .setPathToTimeNet (pathToTimeNet );
1090- support .setMainFrame (this );
1091- support .setOriginalFilename (fileName );
1092- support .setStatusLabel (jLabelExportStatus );
1093- support .setMeasureFormPane (jTabbedPaneOptiTargets );
1094- //support.setTypeOfStartValue((typeOfStartValueEnum)support.getOptimizerPreferences().jComboBoxTypeOfStartValue.getSelectedItem());
1095-
1096- //If Parameterbase is null -->eject
1097- if (support .getParameterBase () == null ) {
1098- support .setStatusText ("No Paramaterbase set." );
1099- support .log ("No Paramaterbase set. No Simulation possible." , typeOfLogLevel .INFO );
1100- this .popUIState ();
1101- return ;
1102- }
1103- //Remove all old Optimizationstatistics
1104- StatisticAggregator .removeOldOptimizationsFromList ();
1105-
1106- //Save original Parameterset, for stepping and designspace borders
1107- support .setOriginalParameterBase (support .getCopyOfParameterSet (support .getParameterBase ()));
1108- //start Optimization via extra method, set number of multiple optimizations before
1109- support .setNumberOfOptiRunsToGo ((Integer ) this .jSpinnerNumberOfOptimizationRuns .getValue ());
1110- support .getOptimizerPreferences ().setNumberOfActualOptimizationAnalysis (0 );
1111- startOptimizationAgain ();
1112-
1113- } else {
1114- support .log ("No Tmp-Path given, Optimization not possible." , typeOfLogLevel .ERROR );
1104+ } else if (this .getListOfActiveMeasureMentsToOptimize ().size () >= 1 ) {
1105+ this .switchUIState (uiState .processRunning );
1106+ //Ask for Tmp-Path
1107+ String tPath = (support .getPathToDirByDialog ("Dir for export TMP-Files and log.\n " , support .getTmpPath ()));
1108+ //if tmpPath is empty or null --> return
1109+ if (tPath != null ) {
1110+ support .setTmpPath (tPath );
1111+ this .saveProperties ();
1112+ support .setPathToTimeNet (pathToTimeNet );
1113+ support .setMainFrame (this );
1114+ support .setOriginalFilename (fileName );
1115+ support .setStatusLabel (jLabelExportStatus );
1116+ support .setMeasureFormPane (jTabbedPaneOptiTargets );
1117+ //support.setTypeOfStartValue((typeOfStartValueEnum)support.getOptimizerPreferences().jComboBoxTypeOfStartValue.getSelectedItem());
1118+
1119+ //If Parameterbase is null -->eject
1120+ if (support .getParameterBase () == null ) {
1121+ support .setStatusText ("No Paramaterbase set." );
1122+ support .log ("No Paramaterbase set. No Simulation possible." , typeOfLogLevel .INFO );
11151123 this .popUIState ();
1124+ return ;
11161125 }
1126+ //Remove all old Optimizationstatistics
1127+ StatisticAggregator .removeOldOptimizationsFromList ();
1128+
1129+ //Save original Parameterset, for stepping and designspace borders
1130+ support .setOriginalParameterBase (support .getCopyOfParameterSet (support .getParameterBase ()));
1131+ //start Optimization via extra method, set number of multiple optimizations before
1132+ support .setNumberOfOptiRunsToGo ((Integer ) this .jSpinnerNumberOfOptimizationRuns .getValue ());
1133+ support .getOptimizerPreferences ().setNumberOfActualOptimizationAnalysis (0 );
1134+ startOptimizationAgain ();
11171135
11181136 } else {
1119- support .log ("No Measurements to optimize for are chosen ." , typeOfLogLevel .INFO );
1120- support . setStatusText ( "No Measurements chosen. No Opti possible." );
1137+ support .log ("No Tmp-Path given, Optimization not possible ." , typeOfLogLevel .ERROR );
1138+ this . popUIState ( );
11211139 }
1140+
1141+ } else {
1142+ support .log ("No Measurements to optimize for are chosen." , typeOfLogLevel .INFO );
1143+ support .setStatusText ("No Measurements chosen. No Opti possible." );
11221144 }
11231145 }//GEN-LAST:event_jButtonStartOptimizationActionPerformed
11241146
@@ -1421,7 +1443,7 @@ private void jProgressBarMemoryUsageMouseClicked(java.awt.event.MouseEvent evt)
14211443 * @param evt Event from mouseclick
14221444 */
14231445 private void jCheckBoxSlaveSimulatorMouseClicked (java .awt .event .MouseEvent evt ) {//GEN-FIRST:event_jCheckBoxSlaveSimulatorMouseClicked
1424- //set Property for startup
1446+ //set Property for startup
14251447 //start the Slave-Thread
14261448
14271449 //If is selected and will be unselected then stop thread
0 commit comments