se implemento el registro de la respuesta en la red bayesiana con

refresco de la evidencia

11 files changed, 31 insertions, 6 deletions

diff --git a/EjercitarServer/.classpath b/EjercitarServer/.classpath
index d77970e..c9ceff6 100644
--- a/EjercitarServer/.classpath
+++ b/EjercitarServer/.classpath
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

 	<classpathentry kind="src" path="ejbModule"/>

+	<classpathentry kind="src" path="redes"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">

 		<attributes>

 			<attribute name="owner.project.facets" value="java"/>

 		</attributes>

 	</classpathentry>

 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/EjercitarJPA"/>

+	<classpathentry kind="lib" path="C:/Users/Samu/Downloads/hibernate-distribution-3.6.4.Final/lib/jpa/hibernate-jpa-2.0-api-1.0.0.Final.jar"/>

+	<classpathentry kind="con" path="org.jboss.ide.eclipse.as.classpath.core.ejb3.classpathContainer/JBoss 6.x Runtime Server"/>

+	<classpathentry kind="con" path="org.jboss.ide.eclipse.as.classpath.core.javaee-5.0"/>

+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>

+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 6.x Runtime"/>

+	<classpathentry kind="lib" path="lib/postgresql-9.0-801.jdbc4.jar"/>

+	<classpathentry kind="lib" path="lib/smile.jar"/>

 	<classpathentry kind="output" path="build/classes"/>

 </classpath>

diff --git a/EjercitarServer/.settings/org.eclipse.wst.common.component b/EjercitarServer/.settings/org.eclipse.wst.common.component
index d6ecce5..092b8d5 100644
--- a/EjercitarServer/.settings/org.eclipse.wst.common.component
+++ b/EjercitarServer/.settings/org.eclipse.wst.common.component
@@ -2,6 +2,7 @@
 <project-modules id="moduleCoreId" project-version="1.5.0">

     <wb-module deploy-name="EjercitarServer">

         <wb-resource deploy-path="/" source-path="/ejbModule" tag="defaultRootSource"/>

+        <wb-resource deploy-path="/" source-path="/redes"/>

         <property name="java-output-path" value="/EjercitarServer/build/classes"/>

     </wb-module>

 </project-modules>

diff --git a/EjercitarServer/.settings/org.hibernate.eclipse.console.prefs b/EjercitarServer/.settings/org.hibernate.eclipse.console.prefs
new file mode 100644
index 0000000..8fdae10
--- /dev/null
+++ b/EjercitarServer/.settings/org.hibernate.eclipse.console.prefs
@@ -0,0 +1,3 @@
+default.configuration=

+eclipse.preferences.version=1

+hibernate3.enabled=false

diff --git a/EjercitarServer/.settings/org.jboss.ide.eclipse.as.core.prefs b/EjercitarServer/.settings/org.jboss.ide.eclipse.as.core.prefs
new file mode 100644
index 0000000..1b1209b
--- /dev/null
+++ b/EjercitarServer/.settings/org.jboss.ide.eclipse.as.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1

+org.jboss.ide.eclipse.as.core.singledeployable.deployableList=\n\n

diff --git a/EjercitarServer/build/classes/META-INF/MANIFEST.MF b/EjercitarServer/build/classes/META-INF/MANIFEST.MF
index 5e94951..58630c0 100644
--- a/EjercitarServer/build/classes/META-INF/MANIFEST.MF
+++ b/EjercitarServer/build/classes/META-INF/MANIFEST.MF
@@ -1,3 +1,2 @@
 Manifest-Version: 1.0

-Class-Path: 

 

diff --git a/EjercitarServer/build/classes/beans/EjercitarWS.class b/EjercitarServer/build/classes/beans/EjercitarWS.class
deleted file mode 100644
index 8619814..0000000
--- a/EjercitarServer/build/classes/beans/EjercitarWS.class
+++ /dev/null
diff --git a/EjercitarServer/build/classes/beans/EjercitarWSBean.class b/EjercitarServer/build/classes/beans/EjercitarWSBean.class
new file mode 100644
index 0000000..dda2095
--- /dev/null
+++ b/EjercitarServer/build/classes/beans/EjercitarWSBean.class
diff --git a/EjercitarServer/build/classes/beans/EjercitarWSRemote.class b/EjercitarServer/build/classes/beans/EjercitarWSRemote.class
new file mode 100644
index 0000000..aa70d7c
--- /dev/null
+++ b/EjercitarServer/build/classes/beans/EjercitarWSRemote.class
diff --git a/EjercitarServer/build/classes/beans/Test.class b/EjercitarServer/build/classes/beans/Test.class
new file mode 100644
index 0000000..c6ac9df
--- /dev/null
+++ b/EjercitarServer/build/classes/beans/Test.class
diff --git a/EjercitarServer/ejbModule/META-INF/MANIFEST.MF b/EjercitarServer/ejbModule/META-INF/MANIFEST.MF
index 5e94951..58630c0 100644
--- a/EjercitarServer/ejbModule/META-INF/MANIFEST.MF
+++ b/EjercitarServer/ejbModule/META-INF/MANIFEST.MF
@@ -1,3 +1,2 @@
 Manifest-Version: 1.0

-Class-Path: 

 

diff --git a/EjercitarServer/ejbModule/beans/EjercitarWSBean.java b/EjercitarServer/ejbModule/beans/EjercitarWSBean.java
index b006864..9a926f4 100644
--- a/EjercitarServer/ejbModule/beans/EjercitarWSBean.java
+++ b/EjercitarServer/ejbModule/beans/EjercitarWSBean.java
@@ -76,6 +76,7 @@ public class EjercitarWSBean implements EjercitarWSRemote {
 		Ejercicio ejercicio = em.find(Ejercicio.class, idEjercicio);

 		Network net1 = new Network();

 		String nombreRed = "red_alumno_" + alumno.getIdAlumno() + ".xdsl";

+		net1.readFile(nombreRed);

 		net1.updateBeliefs();

 		String nombreEjercicio = "E" + idEjercicio;

 		

@@ -84,6 +85,18 @@ public class EjercitarWSBean implements EjercitarWSRemote {
 		} else {

 			net1.setEvidence(nombreEjercicio, "Incorrecto");

 		}

+		net1.updateBeliefs();

+		

+		List<Concepto> conceptoList = ejercicio.getConceptoList();

+		for(Concepto concepto : conceptoList) {

+			String nombreConcepto = "C" + concepto.getIdConcepto();

+			double [] probCalc = net1.getNodeValue(nombreConcepto);

+			net1.setNodeDefinition(nombreConcepto, probCalc);

+		}

+			

+		net1.clearEvidence(nombreEjercicio);

+		net1.updateBeliefs();

+		net1.writeFile(nombreRed);

 	}

 	

 	@WebMethod

@@ -107,8 +120,9 @@ public class EjercitarWSBean implements EjercitarWSRemote {
 	

 	private Ejercicio seleccionUtilidadMax(Tarea tarea, Alumno alumno) {

 		Tema tema = tarea.getTema();

-		List<Concepto> conceptoList = new ArrayList();		

-		conceptoList.add(tema.getIdConcepto()); // CAMBIAR	

+		//List<Concepto> conceptoList = new ArrayList();	

+		List<Concepto> conceptoList = tema.getConceptoList();

+		

 		

 		// inicializacion

 		double utilidadMax = 0;

@@ -160,8 +174,8 @@ public class EjercitarWSBean implements EjercitarWSRemote {
 					ejercicio = ejercicioConcepto;

 				}

 			}

+			

 		}

-		

 		return ejercicio;

 	}