[jboss-svn-commits] JBL Code SVN: r25395 - labs/jbossrules/branches/uncDrools5x/Essence/src/main/java/uncertainty/truthvals.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Feb 23 15:31:25 EST 2009
Author: dsotty
Date: 2009-02-23 15:31:25 -0500 (Mon, 23 Feb 2009)
New Revision: 25395
Modified:
labs/jbossrules/branches/uncDrools5x/Essence/src/main/java/uncertainty/truthvals/Essence.java
Log:
commented opengl dependency
Modified: labs/jbossrules/branches/uncDrools5x/Essence/src/main/java/uncertainty/truthvals/Essence.java
===================================================================
--- labs/jbossrules/branches/uncDrools5x/Essence/src/main/java/uncertainty/truthvals/Essence.java 2009-02-23 20:20:57 UTC (rev 25394)
+++ labs/jbossrules/branches/uncDrools5x/Essence/src/main/java/uncertainty/truthvals/Essence.java 2009-02-23 20:31:25 UTC (rev 25395)
@@ -9,6 +9,7 @@
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Rectangle;
+import java.io.Serializable;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
@@ -63,7 +64,7 @@
*/
public class Essence
extends ImpreciseProbability
- implements IUncertainDistribution {
+ implements IUncertainDistribution, Serializable {
@@ -1505,7 +1506,7 @@
public Degree getAverageDegree() {
double ans = 0;
for (int j = 0; j < N; j++) {
- ans += (1.0/N)*(j)*p[j];
+ ans += ((1.0/N) * j) * p[j];
}
return new Degree(ans);
}
@@ -2029,70 +2030,70 @@
- public void renderCompactOpenGL(GL gl, GLUT glut, double[] colorMask, boolean highlight) {
- gl.glPushAttrib(GL.GL_CURRENT_BIT);
-
-
-
- for (int j = 0; j < N; j++) {
- double h = getP(j);
-
- if (highlight) {
- if (h < 1.0/10) {
- //gl.glColor3d(0,0,0);
- h = 0;
- } else {
- h = Math.sqrt(h);
- h = 1.0 / Math.exp(10*(0.5-h));
- }
- }
- //h = 0.25+h*0.75;
-
- double[] cols = new double[3];
- for (int idx = 0; idx < 3; idx++) {
- cols[idx] = 1 -h*(1 -colorMask[idx]);
- }
-
-
- //h = 1-h;
-
- //gl.glColor3d(h*colorMask[0],h*colorMask[1],h*colorMask[2]);
-
- gl.glColor3d(cols[0],cols[1],cols[2]);
- //if (j == m) gl.glColor3d(1,1,1);
- gl.glBegin(GL.GL_POLYGON);
- gl.glVertex3d(0,0.1*j,0);
- gl.glVertex3d(0.1,0.1*j,0);
- gl.glVertex3d(0.1,0.1*(j+1),0);
- gl.glVertex3d(0,0.1*(j+1),0);
- gl.glVertex3d(0,0.1*j,0);
- gl.glEnd();
-
-
- }
-
-
- gl.glColor3d(0,0,1);
- gl.glBegin(GL.GL_POLYGON);
- //double j = getTau().getValue();
- int j = getTauIdx();
- gl.glVertex3d(0,0.1*j,0);
- gl.glVertex3d(0.1,0.1*j,0);
- gl.glVertex3d(0.1,0.1*j+0.03,0);
- gl.glVertex3d(0,0.1*j+0.03,0);
- gl.glVertex3d(0,0.1*j,0);
- gl.glEnd();
- gl.glColor3d(0,0,1);
- gl.glBegin(GL.GL_POLYGON);
- j = getFiIdx();
- gl.glVertex3d(0,0.1*j,0);
- gl.glVertex3d(0.1,0.1*j,0);
- gl.glVertex3d(0.1,0.1*j-0.03,0);
- gl.glVertex3d(0,0.1*j-0.03,0);
- gl.glVertex3d(0,0.1*j,0);
- gl.glEnd();
- gl.glPopAttrib();
- }
+//// public void renderCompactOpenGL(GL gl, GLUT glut, double[] colorMask, boolean highlight) {
+// gl.glPushAttrib(GL.GL_CURRENT_BIT);
+//
+//
+//
+// for (int j = 0; j < N; j++) {
+// double h = getP(j);
+//
+// if (highlight) {
+// if (h < 1.0/10) {
+// //gl.glColor3d(0,0,0);
+// h = 0;
+// } else {
+// h = Math.sqrt(h);
+// h = 1.0 / Math.exp(10*(0.5-h));
+// }
+// }
+// //h = 0.25+h*0.75;
+//
+// double[] cols = new double[3];
+// for (int idx = 0; idx < 3; idx++) {
+// cols[idx] = 1 -h*(1 -colorMask[idx]);
+// }
+//
+//
+// //h = 1-h;
+//
+// //gl.glColor3d(h*colorMask[0],h*colorMask[1],h*colorMask[2]);
+//
+// gl.glColor3d(cols[0],cols[1],cols[2]);
+// //if (j == m) gl.glColor3d(1,1,1);
+// gl.glBegin(GL.GL_POLYGON);
+// gl.glVertex3d(0,0.1*j,0);
+// gl.glVertex3d(0.1,0.1*j,0);
+// gl.glVertex3d(0.1,0.1*(j+1),0);
+// gl.glVertex3d(0,0.1*(j+1),0);
+// gl.glVertex3d(0,0.1*j,0);
+// gl.glEnd();
+//
+//
+// }
+//
+//
+// gl.glColor3d(0,0,1);
+// gl.glBegin(GL.GL_POLYGON);
+// //double j = getTau().getValue();
+// int j = getTauIdx();
+// gl.glVertex3d(0,0.1*j,0);
+// gl.glVertex3d(0.1,0.1*j,0);
+// gl.glVertex3d(0.1,0.1*j+0.03,0);
+// gl.glVertex3d(0,0.1*j+0.03,0);
+// gl.glVertex3d(0,0.1*j,0);
+// gl.glEnd();
+// gl.glColor3d(0,0,1);
+// gl.glBegin(GL.GL_POLYGON);
+// j = getFiIdx();
+// gl.glVertex3d(0,0.1*j,0);
+// gl.glVertex3d(0.1,0.1*j,0);
+// gl.glVertex3d(0.1,0.1*j-0.03,0);
+// gl.glVertex3d(0,0.1*j-0.03,0);
+// gl.glVertex3d(0,0.1*j,0);
+// gl.glEnd();
+// gl.glPopAttrib();
+// }
@@ -2211,7 +2212,7 @@
*/
@Override
public boolean toBoolean() {
- return this.getAverageDegree().toBoolean();
+ return this.getAverageDegree().toBoolean();
}
More information about the jboss-svn-commits
mailing list