[ifcsoft] 4 new revisions pushed by kyle.tha...@gmail.com on 2011-05-25 17:53 GMT
ifc...@googlecode.com
Revision: 60bba5f5a859
Author: sjabba2@10D_BIOS036
Date: Wed May 25 08:09:57 2011
Log: Add Make Histigram, Scatter Plot, and WRC bottoms to the Display
tab.
http://code.google.com/p/ifcsoft/source/detail?r=60bba5f5a859
Revision: 500e7eb87e9b
Author: sjabba2@10D_BIOS036
Date: Wed May 25 08:28:15 2011
Log: Change scatter plot dialog box so its first dimension for X and
secon...
http://code.google.com/p/ifcsoft/source/detail?r=500e7eb87e9b
Revision: 0bf566317417
Author: sjabba2@10D_BIOS036
Date: Wed May 25 09:13:13 2011
Log: The random-initialization function for SOM was never called (it
was al...
http://code.google.com/p/ifcsoft/source/detail?r=0bf566317417
Revision: 5581e21aca89
Author: kthayer
Date: Wed May 25 10:52:00 2011
Log: Merge
http://code.google.com/p/ifcsoft/source/detail?r=5581e21aca89
==============================================================================
Revision: 60bba5f5a859
Author: sjabba2@10D_BIOS036
Date: Wed May 25 08:09:57 2011
Log: Add Make Histigram, Scatter Plot, and WRC bottoms to the Display
tab.
http://code.google.com/p/ifcsoft/source/detail?r=60bba5f5a859
Modified:
/src/ifcSoft/view/Menus.fx
=======================================
--- /src/ifcSoft/view/Menus.fx Mon May 16 15:28:39 2011
+++ /src/ifcSoft/view/Menus.fx Wed May 25 08:09:57 2011
@@ -284,10 +284,28 @@
fill: Color.WHITE
}
Button{
- layoutX: 0 layoutY: 50
+ layoutX: 200 layoutY: 50
text: "Calculate SOM"
blocksMouse: false
action: function(){app.SOM();}
+ }
+ Button{
+ layoutX: -280 layoutY: 50
+ text: "Make Histogram"
+ blocksMouse: false
+ action: function(){app.histogramDlg();}
+ }
+ Button{
+ layoutX: -140 layoutY: 50
+ text: "Make Scatter Plot"
+ blocksMouse: false
+ action: function(){app.scatterplotDlg();}
+ }
+ Button{
+ layoutX: 20 layoutY: 50
+ text: "Make Wind Rose Chart"
+ blocksMouse: false
+ action: function(){app.windrosePlotDlg();}
},
/*fullscreenButton = Button{
layoutX: 150 layoutY: 50
==============================================================================
Revision: 500e7eb87e9b
Author: sjabba2@10D_BIOS036
Date: Wed May 25 08:28:15 2011
Log: Change scatter plot dialog box so its first dimension for X and
second for Y.
http://code.google.com/p/ifcsoft/source/detail?r=500e7eb87e9b
Modified:
/src/ifcSoft/view/scatterplot/MakeScatterDialog.fx
=======================================
--- /src/ifcSoft/view/scatterplot/MakeScatterDialog.fx Fri Feb 11 10:49:36
2011
+++ /src/ifcSoft/view/scatterplot/MakeScatterDialog.fx Wed May 25 08:28:15
2011
@@ -64,6 +64,7 @@
dim2Input = ifcDialogChoiceBox{
name:"Y-Axis"
items: bind dimensions
+ initialSelectedItem:dimensions[1]
};
scatterDialog = ifcDialogBox{
==============================================================================
Revision: 0bf566317417
Author: sjabba2@10D_BIOS036
Date: Wed May 25 09:13:13 2011
Log: The random-initialization function for SOM was never called (it
was also incomplete). Now it's fixed.
http://code.google.com/p/ifcsoft/source/detail?r=0bf566317417
Modified:
/src/ifcSoft/model/som/SOM.java
/src/ifcSoft/model/som/SOMInitFns.java
=======================================
--- /src/ifcSoft/model/som/SOM.java Tue Apr 19 14:14:33 2011
+++ /src/ifcSoft/model/som/SOM.java Wed May 25 09:13:13 2011
@@ -187,15 +187,7 @@
SOMInitFns.linearInitialize(somSettings.width, somSettings.height,
datasetScalar.getDataSet(), this);
checkWeighting();
}else if (somSettings.initType == SOMSettings.RANDOMINIT){
- for(int i = 0; i < SOMnodes.length; i++){
- for(int j = 0; j < SOMnodes[0].length; j++){
- //initialize with random points from the data
- SOMnodes[i][j] = new SOMNode(
- datasetScalar.getPoint((int) (Math.random() *
(datasetScalar.length() - 1)))
- );
- //SOMNode[i][j] = new SOMNode(dims,
datasetScalar.getMins(), .getMaxes())
- }
- }
+ SOMInitFns.randomInitialize(somSettings.width, somSettings.height,
this);
}else if (somSettings.initType == SOMSettings.FILEINIT){
try {
SOMInitFns.loadSOMfile(dims, this);
=======================================
--- /src/ifcSoft/model/som/SOMInitFns.java Fri Feb 11 10:49:36 2011
+++ /src/ifcSoft/model/som/SOMInitFns.java Wed May 25 09:13:13 2011
@@ -75,12 +75,14 @@
}
}
- static public void randomInitialize(int dims, int width, int height, SOM
som){
+ static public void randomInitialize(int width, int height, SOM som){
//initialize nodes with random points
- for(int i = 0; i < width; i++){
- for(int j=0; j < height; j++){
- float initialWeights[] = new float[dims]; //TODO: load random
points instead
- som.SOMnodes[i][j] = new SOMNode(initialWeights);
+ for(int i = 0; i < width ; i++){
+ for(int j = 0; j < height ; j++){
+ //initialize with random points from the data
+ som.SOMnodes[i][j] = new SOMNode(
+ som.datasetScalar.getPoint((int) (Math.random() *
(som.datasetScalar.length() - 1)))
+ );
}
}
}
==============================================================================
Revision: 5581e21aca89
Author: kthayer
Date: Wed May 25 10:52:00 2011
Log: Merge
http://code.google.com/p/ifcsoft/source/detail?r=5581e21aca89
Modified:
/nbproject/project.properties
/src/ifcSoft/view/Menus.fx
=======================================
--- /nbproject/project.properties Mon May 16 15:28:39 2011
+++ /nbproject/project.properties Wed May 25 10:52:00 2011
@@ -46,7 +46,7 @@
jnlp.codebase.url=file:/Z:/KyleT/New%20program/netbeansworkspace/IFCSoft/dist/
jnlp.offline-allowed=true
jnlp.packEnabled=false
-jnlp.signed=true
+jnlp.signed=false
jnlp.update.model=always
main.class=ifcSoft.MainApp
pack200.jar.compress=true
=======================================
--- /src/ifcSoft/view/Menus.fx Tue May 24 14:05:16 2011
+++ /src/ifcSoft/view/Menus.fx Wed May 25 10:52:00 2011
@@ -284,10 +284,28 @@
fill: Color.WHITE
}
Button{
- layoutX: 0 layoutY: 50
+ layoutX: 200 layoutY: 50
text: "Calculate SOM"
blocksMouse: false
action: function(){app.SOM();}
+ }
+ Button{
+ layoutX: -280 layoutY: 50
+ text: "Make Histogram"
+ blocksMouse: false
+ action: function(){app.histogramDlg();}
+ }
+ Button{
+ layoutX: -140 layoutY: 50
+ text: "Make Scatter Plot"
+ blocksMouse: false
+ action: function(){app.scatterplotDlg();}
+ }
+ Button{
+ layoutX: 20 layoutY: 50
+ text: "Make Wind Rose Chart"
+ blocksMouse: false
+ action: function(){app.windrosePlotDlg();}
},
/*fullscreenButton = Button{
layoutX: 150 layoutY: 50