[jbpm-commits] JBoss JBPM SVN: r6605 - in jbpm3/branches/jbpm-3.2-soa: modules/core and 12 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Aug 17 22:53:17 EDT 2010
Author: alex.guizar at jboss.com
Date: 2010-08-17 22:53:16 -0400 (Tue, 17 Aug 2010)
New Revision: 6605
Added:
jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-config.xml
Removed:
jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-jbpm-config.xml
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/GraphSession.java
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-test-dependencies.xml
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/java/org/jbpm/ejb/impl/JobListenerBean.java
jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/bam/BamSimulationProposal.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/bam/GetSimulationInputCommand.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/DistributionDefinition.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationModel.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationScenario.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/ResourceRequirement.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/entity/ResourceUsingEntity.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/exe/ExperimentReader.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/AcklamStatUtil.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/ScenarioReport.java
jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/StatUtil.java
jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/pom.xml
jbpm3/branches/jbpm-3.2-soa/pom.xml
Log:
prevent maven javadoc plugin from running twice;
fix javadoc tags
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2010-08-17 22:03:45 UTC (rev 6604)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2010-08-18 02:53:16 UTC (rev 6605)
@@ -127,13 +127,12 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
+ <id>pack-config</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
- <finalName>${project.build.finalName}</finalName>
- <appendAssemblyId>true</appendAssemblyId>
<descriptors>
<descriptor>scripts/assembly-config.xml</descriptor>
</descriptors>
@@ -143,13 +142,6 @@
</plugin>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <showDeprecation>false</showDeprecation>
- </configuration>
- </plugin>
-
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<excludes>
@@ -165,6 +157,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
+ <id>gen-config</id>
<phase>compile</phase>
<goals>
<goal>run</goal>
@@ -172,7 +165,7 @@
<configuration>
<tasks>
<property name="database" value="${database}" />
- <ant antfile="scripts/antrun-jbpm-config.xml" target="cat-hibernate-cfg" />
+ <ant antfile="scripts/antrun-config.xml" target="gen-hibernate-config" />
</tasks>
</configuration>
</execution>
@@ -196,6 +189,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
+ <id>gen-config-soa</id>
<phase>process-resources</phase>
<goals>
<goal>run</goal>
@@ -203,8 +197,8 @@
<configuration>
<tasks>
<property name="database" value="${database}" />
- <ant antfile="scripts/antrun-jbpm-config.xml" target="cat-hibernate-cfg" />
- <ant antfile="scripts/antrun-jbpm-config.xml" target="jbpm-cfg-xml-soa" />
+ <ant antfile="scripts/antrun-config.xml" target="gen-hibernate-config" />
+ <ant antfile="scripts/antrun-config.xml" target="gen-jbpm-config-soa" />
</tasks>
</configuration>
</execution>
Copied: jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-config.xml (from rev 6603, jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-jbpm-config.xml)
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-config.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-config.xml 2010-08-18 02:53:16 UTC (rev 6605)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ====================================================================== -->
+
+<project name="gen-config">
+
+ <property name="project.build.directory" value="${basedir}/target" />
+ <property name="build.resources.directory" value="${basedir}/target/classes" />
+
+ <macrodef name="macro-disable">
+ <attribute name="file" />
+ <attribute name="section" />
+ <sequential>
+ <replace file="@{file}" summary="true">
+ <replacefilter token="<!-- @{section} (begin) -->"
+ value="<!-- @{section} (begin) ===" />
+ <replacefilter token="<!-- @{section} (end) -->" value="==== @{section} (end) -->" />
+ </replace>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-enable">
+ <attribute name="file" />
+ <attribute name="section" />
+ <sequential>
+ <replace file="@{file}" summary="true">
+ <replacefilter token="<!-- @{section} (begin) ==="
+ value="<!-- @{section} (begin) -->" />
+ <replacefilter token="==== @{section} (end) -->"
+ value="<!-- @{section} (end) -->" />
+ </replace>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="cat-hibernate-config">
+ <attribute name="database" />
+ <sequential>
+ <available property="@{database}.properties.available"
+ file="${build.resources.directory}/hibernate.properties.@{database}.xml" />
+ <fail message="hibernate.properties.@{database}.xml not available"
+ unless="@{database}.properties.available" />
+
+ <condition property="hibernate.mapping.@{database}.xml"
+ value="hibernate.mapping.@{database}.xml"
+ else="hibernate.mapping.default.xml">
+ <available property="@{database}.mapping.available"
+ file="${build.resources.directory}/hibernate.mapping.@{database}.xml" />
+ </condition>
+
+ <!-- concatenate hibernate.cfg.xml -->
+ <concat destfile="${project.build.directory}/classes/hibernate.cfg.@{database}.xml"
+ outputencoding="UTF-8">
+ <header><![CDATA[<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE hibernate-configuration PUBLIC
+ "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+
+<hibernate-configuration>
+ <session-factory>
+]]></header>
+ <fileset file="${build.resources.directory}/hibernate.properties.@{database}.xml" />
+ <fileset file="${build.resources.directory}/hibernate.common.xml" />
+ <fileset file="${build.resources.directory}/${hibernate.mapping.@{database}.xml}" />
+ <fileset file="${build.resources.directory}/hibernate.cache.xml" />
+ <footer><![CDATA[ </session-factory>
+</hibernate-configuration>
+]]></footer>
+ </concat>
+ </sequential>
+ </macrodef>
+
+ <target name="gen-hibernate-config" description="generate hibernate configuration">
+ <cat-hibernate-config database="db2" />
+ <cat-hibernate-config database="derby" />
+ <cat-hibernate-config database="firebird" />
+ <cat-hibernate-config database="hsqldb" />
+ <cat-hibernate-config database="ingres" />
+ <cat-hibernate-config database="interbase" />
+ <cat-hibernate-config database="mckoi" />
+ <cat-hibernate-config database="mssql" />
+ <cat-hibernate-config database="mysql" />
+ <cat-hibernate-config database="oracle" />
+ <cat-hibernate-config database="postgresql" />
+ <cat-hibernate-config database="sapdb" />
+ <cat-hibernate-config database="sybase" />
+
+ <copy file="${project.build.directory}/classes/hibernate.cfg.${database}.xml"
+ tofile="${project.build.directory}/classes/hibernate.cfg.xml" />
+ </target>
+
+ <target name="gen-jbpm-config-soa" description="generate jbpm configuration for soa-p">
+ <macro-disable section="Logging Service"
+ file="${project.build.directory}/classes/org/jbpm/default.jbpm.cfg.xml" />
+ </target>
+</project>
Deleted: jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-jbpm-config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-jbpm-config.xml 2010-08-17 22:03:45 UTC (rev 6604)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-jbpm-config.xml 2010-08-18 02:53:16 UTC (rev 6605)
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- jBPM: Workflow in Java -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- ====================================================================== -->
-
-<project name="hibernate-config" default="cat-hibernate-cfg">
-
- <property name="project.build.directory" value="${basedir}/target"/>
- <property name="build.resources.directory" value="${basedir}/target/classes"/>
-
- <macrodef name="macro-disable">
- <attribute name="file" />
- <attribute name="section" />
- <sequential>
- <replace file="@{file}" summary="true">
- <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) -->]]></replacetoken>
- <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) ===]]></replacevalue>
- </replace>
- <replace file="@{file}" summary="true">
- <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (end) -->]]></replacetoken>
- <replacevalue><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacevalue>
- </replace>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-enable">
- <attribute name="file" />
- <attribute name="section" />
- <sequential>
- <replace file="@{file}" summary="true">
- <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) ===]]></replacetoken>
- <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) -->]]></replacevalue>
- </replace>
- <replace file="@{file}" summary="true">
- <replacetoken><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacetoken>
- <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (end) -->]]></replacevalue>
- </replace>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-database-cfg">
- <attribute name="database" />
- <sequential>
-
- <available property="@{database}.properties.available" file="${build.resources.directory}/hibernate.properties.@{database}.xml"/>
- <fail message="hibernate.properties.@{database}.xml not available" unless="@{database}.properties.available"/>
-
- <condition property="hibernate.mapping.@{database}.xml" value="hibernate.mapping.@{database}.xml" else="hibernate.mapping.default.xml">
- <available property="@{database}.mapping.available" file="${build.resources.directory}/hibernate.mapping.@{database}.xml"/>
- </condition>
-
- <echo message="Concat hibernate.cfg.@{database}.xml using hibernate.properties.@{database}.xml, ${hibernate.mapping.@{database}.xml}" />
-
- <!-- Concat hibernate.cfg.xml -->
- <concat destfile="${project.build.directory}/classes/hibernate.cfg.@{database}.xml">
- <header><![CDATA[<?xml version='1.0' encoding='utf-8'?>
-<!DOCTYPE hibernate-configuration PUBLIC
- "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-
-<hibernate-configuration>
- <session-factory>
-]]></header>
- <fileset file="${build.resources.directory}/hibernate.properties.@{database}.xml" />
- <fileset file="${build.resources.directory}/hibernate.common.xml" />
- <fileset file="${build.resources.directory}/${hibernate.mapping.@{database}.xml}" />
- <fileset file="${build.resources.directory}/hibernate.cache.xml" />
- <footer><![CDATA[ </session-factory>
-</hibernate-configuration>]]></footer>
- </concat>
- </sequential>
- </macrodef>
-
- <!-- Concatenates the hibernate config scripts -->
- <target name="cat-hibernate-cfg" >
- <macro-database-cfg database="db2" />
- <macro-database-cfg database="derby" />
- <macro-database-cfg database="firebird" />
- <macro-database-cfg database="hsqldb"/>
- <macro-database-cfg database="ingres" />
- <macro-database-cfg database="interbase" />
- <macro-database-cfg database="mckoi" />
- <macro-database-cfg database="mssql" />
- <macro-database-cfg database="mysql"/>
- <macro-database-cfg database="oracle" />
- <macro-database-cfg database="postgresql"/>
- <macro-database-cfg database="sapdb" />
- <macro-database-cfg database="sybase"/>
-
- <echo message="Copy hibernate.cfg.${database}.xml to hibernate.cfg.xml" />
- <copy file="${project.build.directory}/classes/hibernate.cfg.${database}.xml" tofile="${project.build.directory}/classes/hibernate.cfg.xml"/>
-
- <loadfile property="hibernate.properties.xml" srcFile="${build.resources.directory}/hibernate.properties.${database}.xml"/>
- <echo message="${hibernate.properties.xml}"/>
- </target>
-
- <!-- Generate the custom jbpm.cfg.xml for the SOA platform -->
- <target name="jbpm-cfg-xml-soa" >
- <echo message="Generate the custom jbpm.cfg.xml for the SOA platform" />
- <macro-disable section="Logging Service" file="${project.build.directory}/classes/org/jbpm/default.jbpm.cfg.xml"/>
- </target>
-
-</project>
\ No newline at end of file
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/GraphSession.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/GraphSession.java 2010-08-17 22:03:45 UTC (rev 6604)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/GraphSession.java 2010-08-18 02:53:16 UTC (rev 6605)
@@ -90,7 +90,7 @@
/**
* saves the process definition. this method does not assign a version number.
*
- * @see {@link #deployProcessDefinition(ProcessDefinition)}
+ * @see #deployProcessDefinition(ProcessDefinition)
*/
public void saveProcessDefinition(ProcessDefinition processDefinition) {
try {
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2010-08-17 22:03:45 UTC (rev 6604)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2010-08-18 02:53:16 UTC (rev 6605)
@@ -119,8 +119,6 @@
<goal>single</goal>
</goals>
<configuration>
- <finalName>${project.build.finalName}</finalName>
- <appendAssemblyId>true</appendAssemblyId>
<descriptors>
<descriptor>scripts/assembly-config.xml</descriptor>
</descriptors>
@@ -135,7 +133,6 @@
</goals>
<configuration>
<finalName>test-dependencies</finalName>
- <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>scripts/assembly-test-dependencies.xml</descriptor>
@@ -146,13 +143,6 @@
</plugin>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <showDeprecation>false</showDeprecation>
- </configuration>
- </plugin>
-
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemProperties>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-test-dependencies.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-test-dependencies.xml 2010-08-17 22:03:45 UTC (rev 6604)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-test-dependencies.xml 2010-08-18 02:53:16 UTC (rev 6605)
@@ -1,13 +1,21 @@
-<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ====================================================================== -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>test-dependencies</id>
<formats>
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <!-- Dependency Sets -->
<dependencySets>
<dependencySet>
<outputDirectory>/</outputDirectory>
@@ -24,5 +32,4 @@
<scope>test</scope>
</dependencySet>
</dependencySets>
-
</assembly>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/java/org/jbpm/ejb/impl/JobListenerBean.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/java/org/jbpm/ejb/impl/JobListenerBean.java 2010-08-17 22:03:45 UTC (rev 6604)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/java/org/jbpm/ejb/impl/JobListenerBean.java 2010-08-18 02:53:16 UTC (rev 6605)
@@ -10,17 +10,17 @@
/**
* Message-driven bean that listens for {@link Message messages} containing a reference to a
- * pending {@linkplain Job job}. to support asynchronous continuations.
- *
- * The message must have a property called <code>jobId</code> of type <code>long</code> which
- * references a pending <literal>Job</literal> in the database. The message body, if any, is
- * ignored.
- *
+ * pending {@linkplain org.jbpm.job.Job job} for asynchronous continuations.
+ * <p>
+ * The message must have a <code>long</code> property called <code>jobId</code> which identifies
+ * a job in the database. The message body, if any, is ignored.
+ * </p>
* <h3>Environment</h3>
+ * <p>
+ * This bean inherits its environment entries and resources available for customization from
+ * {@link CommandListenerBean}.
+ * </p>
*
- * This bean extends the {@link CommandListenerBean} and inherits its environment entries and
- * resources available for customization.
- *
* @author Tom Baeyens
* @author Alejandro Guizar
*/
Modified: jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml 2010-08-17 22:03:45 UTC (rev 6604)
+++ jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml 2010-08-18 02:53:16 UTC (rev 6605)
@@ -67,8 +67,6 @@
<goal>single</goal>
</goals>
<configuration>
- <finalName>${project.build.finalName}</finalName>
- <appendAssemblyId>true</appendAssemblyId>
<descriptors>
<descriptor>scripts/assembly-config.xml</descriptor>
</descriptors>
@@ -76,13 +74,6 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <showDeprecation>false</showDeprecation>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/bam/BamSimulationProposal.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/bam/BamSimulationProposal.java 2010-08-17 22:03:45 UTC (rev 6604)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/bam/BamSimulationProposal.java 2010-08-18 02:53:16 UTC (rev 6605)
@@ -61,8 +61,6 @@
/**
* create a new scenario with this process as only process
- *
- * @return
*/
public Element createScenarioConfigurationXml()
{
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/bam/GetSimulationInputCommand.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/bam/GetSimulationInputCommand.java 2010-08-17 22:03:45 UTC (rev 6604)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/bam/GetSimulationInputCommand.java 2010-08-18 02:53:16 UTC (rev 6605)
@@ -216,7 +216,7 @@
* I used this testcode to test a bit locally
* Shoud be deleted or replaced by a real unit test later!!
*
- * @TODO: delete and replace with JUnit test
+ * TODO: delete and replace with JUnit test
*/
public static void main(String[] args) throws Exception {
JbpmContext ctx = JbpmConfiguration.getInstance("org/jbpm/sim/bam/jbpm.cfg.xml").createJbpmContext();
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/DistributionDefinition.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/DistributionDefinition.java 2010-08-17 22:03:45 UTC (rev 6604)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/DistributionDefinition.java 2010-08-18 02:53:16 UTC (rev 6605)
@@ -19,7 +19,7 @@
* It can also create <code>desmoj.core.dist.Distribution<code>'s from this information.
*
* @author bernd.ruecker at camunda.com
- * @TODO: Maybe make this class configurable, to allow own implemented distributions later
+ * TODO: Make this class configurable to allow custom distributions later
*/
public class DistributionDefinition {
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationModel.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationModel.java 2010-08-17 22:03:45 UTC (rev 6604)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationModel.java 2010-08-18 02:53:16 UTC (rev 6605)
@@ -201,7 +201,6 @@
/**
* This is implemented by the concrete implementation of the model
- * @return
*/
public abstract ProcessDefinition[] getProcessDefinitions();
@@ -210,7 +209,6 @@
}
/**
- * @param node
* @return true, if probabilities for leaving transitions are configured for the given node
*/
public boolean hasLeavingTransitionProbabilitiesConfigured(Node node) {
@@ -224,7 +222,6 @@
* If no probabilities for this node are configured,
* the default transition is returned
*
- * @param node
* @return leaving transition to take or the default transition,
* if no probabilities are configured
*/
@@ -247,7 +244,6 @@
* Returns the time, needed to work on the task with the given id
* The time is queried from the configured distribution
*
- * @param taskId
* @return the simulation time when the task should be finished
*/
public SimTime getTaskWorkingTime(Task task) {
@@ -350,9 +346,6 @@
}
/**
- *
- * @param resource
- * pool name
* @return the resource pool as Queue
*/
public Queue getResourcePoolQueue(String poolName) {
@@ -360,10 +353,7 @@
}
/**
- *
- * @param resource
- * pool name
- * @return the resource pool as Queue
+ * @return the resource pool time series
*/
public TimeSeries getResourcePoolTimeSeries(String poolName) {
return getResourcePool(poolName).getAvailableResourceTimeSeries();
@@ -373,8 +363,6 @@
* returns a queue for a resource pool (needed if no resource is available)
* the queues are constructed on the fly.
*
- * @param resource
- * pool name
* @return the queue for the resource pool
*/
public Queue getResourceQueue(String poolName) {
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationScenario.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationScenario.java 2010-08-17 22:03:45 UTC (rev 6604)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationScenario.java 2010-08-18 02:53:16 UTC (rev 6605)
@@ -183,9 +183,7 @@
/**
* persists the process definitions created for this scenario
- * and the process instances and all dependant stuff
- *
- * @param context
+ * and the process instances and all dependent stuff
*/
public void persist(JbpmContext ctx) {
for (Iterator iterator = processDefinitions.iterator(); iterator.hasNext();) {
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/ResourceRequirement.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/ResourceRequirement.java 2010-08-17 22:03:45 UTC (rev 6604)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/ResourceRequirement.java 2010-08-18 02:53:16 UTC (rev 6605)
@@ -1,9 +1,8 @@
package org.jbpm.sim.def;
/**
- *
* @author bernd.ruecker at camunda.com
- * @TODO: rename
+ * TODO: rename
*/
public class ResourceRequirement {
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/entity/ResourceUsingEntity.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/entity/ResourceUsingEntity.java 2010-08-17 22:03:45 UTC (rev 6604)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/entity/ResourceUsingEntity.java 2010-08-18 02:53:16 UTC (rev 6605)
@@ -89,9 +89,6 @@
*
* If so, it is also checked if ALL resources are acquired, then the Entity can start working
* (whatever it does)
- *
- * @param poolName
- * @return
*/
public boolean resourceReleased(String poolName) {
if (!missingResources.contains(poolName))
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/exe/ExperimentReader.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/exe/ExperimentReader.java 2010-08-17 22:03:45 UTC (rev 6604)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/exe/ExperimentReader.java 2010-08-18 02:53:16 UTC (rev 6605)
@@ -84,8 +84,6 @@
* add a process definition to this reader, which can be referenced from a sim-process
* in a experiment. This is useful in test cases, where you don't store the
* process in a XML file, but as a String.
- *
- * @param pd
*/
public void addProcessDefinition(String processName, String processXml) {
/*
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/AcklamStatUtil.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/AcklamStatUtil.java 2010-08-17 22:03:45 UTC (rev 6604)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/AcklamStatUtil.java 2010-08-18 02:53:16 UTC (rev 6605)
@@ -1,37 +1,40 @@
package org.jbpm.sim.report;
/**
- * Class contains the implementation of: - Inverse Normal Cummulative
- * Distribution Function Algorythm
+ * Inverse Normal Cumulative Distribution Function Algorithm implementation.
+ * <p>
+ * Adapted from <a href="mailto:sherali.karimov at proxima-tech.com">Sherali Karimov</a>'s <a
+ * href="http://home.online.no/~pjacklam/notes/invnorm/impl/karimov/StatUtil.java"
+ * >implementation</a> of <a href="mailto:jacklam at math.uio.no">Peter J. Acklam</a>'s <a
+ * href="http://home.online.no/~pjacklam/notes/invnorm/">original algorithm</a>.
+ * </p>
*
- * taken from <a
- * href="http://home.online.no/~pjacklam/notes/invnorm/impl/karimov/StatUtil.java">
- * Sherali Karimov (sherali.karimov at proxima-tech.com)</a>
- *
- * Original algorythm and Perl implementation can be found at:
- * http://www.math.uio.no/~jacklam/notes/invnorm/index.html Author: Peter J.
- * Acklam jacklam at math.uio.no
+ * @author <a href="mailto:sherali.karimov at proxima-tech.com">Sherali Karimov</a>
*/
public class AcklamStatUtil {
-
+
private static final double P_LOW = 0.02425D;
private static final double P_HIGH = 1.0D - P_LOW;
// Coefficients in rational approximations.
- private static final double ICDF_A[] = { -3.969683028665376e+01,
- 2.209460984245205e+02, -2.759285104469687e+02, 1.383577518672690e+02,
- -3.066479806614716e+01, 2.506628277459239e+00 };
+ private static final double ICDF_A[] = {
+ -3.969683028665376e+01, 2.209460984245205e+02, -2.759285104469687e+02,
+ 1.383577518672690e+02, -3.066479806614716e+01, 2.506628277459239e+00
+ };
- private static final double ICDF_B[] = { -5.447609879822406e+01,
- 1.615858368580409e+02, -1.556989798598866e+02, 6.680131188771972e+01,
- -1.328068155288572e+01 };
+ private static final double ICDF_B[] = {
+ -5.447609879822406e+01, 1.615858368580409e+02, -1.556989798598866e+02,
+ 6.680131188771972e+01, -1.328068155288572e+01
+ };
- private static final double ICDF_C[] = { -7.784894002430293e-03,
- -3.223964580411365e-01, -2.400758277161838e+00, -2.549732539343734e+00,
- 4.374664141464968e+00, 2.938163982698783e+00 };
+ private static final double ICDF_C[] = {
+ -7.784894002430293e-03, -3.223964580411365e-01, -2.400758277161838e+00,
+ -2.549732539343734e+00, 4.374664141464968e+00, 2.938163982698783e+00
+ };
- private static final double ICDF_D[] = { 7.784695709041462e-03,
- 3.224671290700398e-01, 2.445134137142996e+00, 3.754408661907416e+00 };
+ private static final double ICDF_D[] = {
+ 7.784695709041462e-03, 3.224671290700398e-01, 2.445134137142996e+00, 3.754408661907416e+00
+ };
public static double getInvCDF(double d, boolean highPrecision) {
// Define break-points.
@@ -49,86 +52,82 @@
else if (d < P_LOW) {
double q = Math.sqrt(-2 * Math.log(d));
z = (((((ICDF_C[0] * q + ICDF_C[1]) * q + ICDF_C[2]) * q + ICDF_C[3]) * q + ICDF_C[4])
- * q + ICDF_C[5])
- / ((((ICDF_D[0] * q + ICDF_D[1]) * q + ICDF_D[2]) * q + ICDF_D[3])
- * q + 1);
+ * q + ICDF_C[5])
+ / ((((ICDF_D[0] * q + ICDF_D[1]) * q + ICDF_D[2]) * q + ICDF_D[3]) * q + 1);
}
// Rational approximation for upper region:
else if (P_HIGH < d) {
double q = Math.sqrt(-2 * Math.log(1 - d));
- z = -(((((ICDF_C[0] * q + ICDF_C[1]) * q + ICDF_C[2]) * q + ICDF_C[3])
- * q + ICDF_C[4])
- * q + ICDF_C[5])
- / ((((ICDF_D[0] * q + ICDF_D[1]) * q + ICDF_D[2]) * q + ICDF_D[3])
- * q + 1);
+ z = -(((((ICDF_C[0] * q + ICDF_C[1]) * q + ICDF_C[2]) * q + ICDF_C[3]) * q + ICDF_C[4])
+ * q + ICDF_C[5])
+ / ((((ICDF_D[0] * q + ICDF_D[1]) * q + ICDF_D[2]) * q + ICDF_D[3]) * q + 1);
}
// Rational approximation for central region:
else {
double q = d - 0.5D;
double r = q * q;
z = (((((ICDF_A[0] * r + ICDF_A[1]) * r + ICDF_A[2]) * r + ICDF_A[3]) * r + ICDF_A[4])
- * r + ICDF_A[5])
- * q
- / (((((ICDF_B[0] * r + ICDF_B[1]) * r + ICDF_B[2]) * r + ICDF_B[3])
- * r + ICDF_B[4])
- * r + 1);
+ * r + ICDF_A[5])
+ * q
+ / (((((ICDF_B[0] * r + ICDF_B[1]) * r + ICDF_B[2]) * r + ICDF_B[3]) * r + ICDF_B[4])
+ * r + 1);
}
if (highPrecision)
z = refine(z, d);
return z;
}
-
-//C------------------------------------------------------------------
-//C Coefficients for approximation to erf in first interval
-//C------------------------------------------------------------------
- private static final double ERF_A[] =
- { 3.16112374387056560E00, 1.13864154151050156E02,
- 3.77485237685302021E02, 3.20937758913846947E03,
- 1.85777706184603153E-1 };
- private static final double ERF_B[] =
- { 2.36012909523441209E01, 2.44024637934444173E02,
- 1.28261652607737228E03, 2.84423683343917062E03 };
+ // ------------------------------------------------------------------
+ // Coefficients for approximation to erf in first interval
+ // ------------------------------------------------------------------
+ private static final double ERF_A[] = {
+ 3.16112374387056560E00, 1.13864154151050156E02, 3.77485237685302021E02,
+ 3.20937758913846947E03, 1.85777706184603153E-1
+ };
-//C------------------------------------------------------------------
-//C Coefficients for approximation to erfc in second interval
-//C------------------------------------------------------------------
- private static final double ERF_C[] =
- { 5.64188496988670089E-1, 8.88314979438837594E0,
- 6.61191906371416295E01, 2.98635138197400131E02,
- 8.81952221241769090E02, 1.71204761263407058E03,
- 2.05107837782607147E03, 1.23033935479799725E03,
- 2.15311535474403846E-8 };
+ private static final double ERF_B[] = {
+ 2.36012909523441209E01, 2.44024637934444173E02, 1.28261652607737228E03,
+ 2.84423683343917062E03
+ };
- private static final double ERF_D[] =
- { 1.57449261107098347E01,1.17693950891312499E02,
- 5.37181101862009858E02,1.62138957456669019E03,
- 3.29079923573345963E03,4.36261909014324716E03,
- 3.43936767414372164E03,1.23033935480374942E03 };
+ // ------------------------------------------------------------------
+ // Coefficients for approximation to erfc in second interval
+ // ------------------------------------------------------------------
+ private static final double ERF_C[] = {
+ 5.64188496988670089E-1, 8.88314979438837594E0, 6.61191906371416295E01,
+ 2.98635138197400131E02, 8.81952221241769090E02, 1.71204761263407058E03,
+ 2.05107837782607147E03, 1.23033935479799725E03, 2.15311535474403846E-8
+ };
-//C------------------------------------------------------------------
-//C Coefficients for approximation to erfc in third interval
-//C------------------------------------------------------------------
- private static final double ERF_P[] =
- { 3.05326634961232344E-1,3.60344899949804439E-1,
- 1.25781726111229246E-1,1.60837851487422766E-2,
- 6.58749161529837803E-4,1.63153871373020978E-2 };
+ private static final double ERF_D[] = {
+ 1.57449261107098347E01, 1.17693950891312499E02, 5.37181101862009858E02,
+ 1.62138957456669019E03, 3.29079923573345963E03, 4.36261909014324716E03,
+ 3.43936767414372164E03, 1.23033935480374942E03
+ };
- private static final double ERF_Q[] =
- { 2.56852019228982242E00,1.87295284992346047E00,
- 5.27905102951428412E-1,6.05183413124413191E-2,
- 2.33520497626869185E-3 };
+ // ------------------------------------------------------------------
+ // Coefficients for approximation to erfc in third interval
+ // ------------------------------------------------------------------
+ private static final double ERF_P[] = {
+ 3.05326634961232344E-1, 3.60344899949804439E-1, 1.25781726111229246E-1,
+ 1.60837851487422766E-2, 6.58749161529837803E-4, 1.63153871373020978E-2
+ };
+ private static final double ERF_Q[] = {
+ 2.56852019228982242E00, 1.87295284992346047E00, 5.27905102951428412E-1,
+ 6.05183413124413191E-2, 2.33520497626869185E-3
+ };
+
private static final double PI_SQRT = Math.sqrt(Math.PI);
private static final double THRESHOLD = 0.46875D;
-/* **************************************
- * Hardware dependant constants were calculated
- * on Dell "Dimension 4100":
- * - Pentium III 800 MHz
- * running Microsoft Windows 2000
- * ************************************* */
+ /* **************************************
+ * Hardware dependant constants were calculated
+ * on Dell "Dimension 4100":
+ * - Pentium III 800 MHz
+ * running Microsoft Windows 2000
+ * ************************************* */
private static final double X_MIN = Double.MIN_VALUE;
private static final double X_INF = Double.MAX_VALUE;
private static final double X_NEG = -9.38241396824444;
@@ -137,134 +136,132 @@
private static final double X_HUGE = 1.0D / (2.0D * Math.sqrt(X_SMALL));
private static final double X_MAX = Math.min(X_INF, (1 / (Math.sqrt(Math.PI) * X_MIN)));
- private static double calerf(double X, int jint)
- {
-/* ******************************************
- * ORIGINAL FORTRAN version can be found at:
- * http://www.netlib.org/specfun/erf
- ********************************************
-C------------------------------------------------------------------
-C
-C THIS PACKET COMPUTES THE ERROR AND COMPLEMENTARY ERROR FUNCTIONS
-C FOR REAL ARGUMENTS ARG. IT CONTAINS TWO FUNCTION TYPE
-C SUBPROGRAMS, ERF AND ERFC (OR DERF AND DERFC), AND ONE
-C SUBROUTINE TYPE SUBPROGRAM, CALERF. THE CALLING STATEMENTS
-C FOR THE PRIMARY ENTRIES ARE
-C
-C Y=ERF(X) (OR Y=DERF(X) )
-C AND
-C Y=ERFC(X) (OR Y=DERFC(X) ).
-C
-C THE ROUTINE CALERF IS INTENDED FOR INTERNAL PACKET USE ONLY,
-C ALL COMPUTATIONS WITHIN THE PACKET BEING CONCENTRATED IN THIS
-C ROUTINE. THE FUNCTION SUBPROGRAMS INVOKE CALERF WITH THE
-C STATEMENT
-C CALL CALERF(ARG,RESULT,JINT)
-C WHERE THE PARAMETER USAGE IS AS FOLLOWS
-C
-C FUNCTION PARAMETERS FOR CALERF
-C CALL ARG RESULT JINT
-C ERF(ARG) ANY REAL ARGUMENT ERF(ARG) 0
-C ERFC(ARG) ABS(ARG) .LT. XMAX ERFC(ARG) 1
-C
-C THE MAIN COMPUTATION EVALUATES NEAR MINIMAX APPROXIMATIONS
-C FROM "RATIONAL CHEBYSHEV APPROXIMATIONS FOR THE ERROR FUNCTION"
-C BY W. J. CODY, MATH. COMP., 1969, PP. 631-638. THIS
-C TRANSPORTABLE PROGRAM USES RATIONAL FUNCTIONS THAT THEORETICALLY
-C APPROXIMATE ERF(X) AND ERFC(X) TO AT LEAST 18 SIGNIFICANT
-C DECIMAL DIGITS. THE ACCURACY ACHIEVED DEPENDS ON THE ARITHMETIC
-C SYSTEM, THE COMPILER, THE INTRINSIC FUNCTIONS, AND PROPER
-C SELECTION OF THE MACHINE-DEPENDENT CONSTANTS.
-C
-C AUTHOR: W. J. CODY
-C MATHEMATICS AND COMPUTER SCIENCE DIVISION
-C ARGONNE NATIONAL LABORATORY
-C ARGONNE, IL 60439
-C
-C LATEST MODIFICATION: JANUARY 8, 1985
-C
-C------------------------------------------------------------------
-*/
+ /**
+ * This packet computes the error and complementary error funtions
+ * for a real argument X. It contains two FUNCTION type
+ * subprograms, ERF and ERFC (or DERF and DERFC), and one
+ * SUBROUTINE type subprogram, CALERF. The calling statements
+ * for the primary entities are
+ * <pre>Y=ERF(X) (or Y=DERF(X) )</pre>
+ * and
+ * <pre>Y=ERFC(X) (or Y=DERFC(X) )</pre>
+ * The routine CALERF is intended for internal packet use only,
+ * all computations within the packet being concentrated in this
+ * routine. The FUNCTION subprograms invoke CALERF with the
+ * statement
+ * <pre>CALL CALERF(ARG,RESULT,JINT)</pre>
+ * where the parameter usage is as follows
+ * <table border="1">
+ * <tr>
+ * <th rowspan="2">Function call</th>
+ * <th colspan="3">Parameters for CALERF</th>
+ * </tr>
+ * <tr>
+ * <th>ARG</th>
+ * <th>RESULT</th>
+ * <th>JINT</th>
+ * </tr>
+ * <tr>
+ * <td>ERF(ARG)</td>
+ * <td>Any REAL argument</td>
+ * <td>ERF(ARG)</td>
+ * <td>0</td>
+ * </tr>
+ * <tr>
+ * <td>ERFC(ARG)</td>
+ * <td>ABS(ARG) < XMAX</td>
+ * <td>ERFC(ARG)</td>
+ * <td>1</td>
+ * </tr>
+ * </table>
+ * <p>
+ * The main computation evaluates near-minimax approximations
+ * from "Rational Chebyshev approximations for the error function"
+ * by W. J. Cody, Math. Comp., 1969, PP. 631-638. This
+ * transportable program uses rational functions that theoretically
+ * approximate erf(x) and erfc(x) to at least 18 significant
+ * decimal digits. The accuracy achieved depends on the arithmetic
+ * system, the compiler, the intrinsic functions, and proper
+ * selection of the machine-dependent constants.
+ * </p>
+ *
+ * @author W. J. Cody
+ * Mathematics and Computer Science Division
+ * Argonne National Laboratory
+ * Argonne, IL 60439
+ * @since January 8, 1985
+ * @see <a href="http://www.netlib.org/specfun/erf">Original FORTRAN version</a>
+ */
+ private static double calerf(double X, int jint) {
double result = 0;
double Y = Math.abs(X);
double Y_SQ, X_NUM, X_DEN;
- if(Y <= THRESHOLD)
- {
+ if (Y <= THRESHOLD) {
Y_SQ = 0.0D;
if (Y > X_SMALL) Y_SQ = Y * Y;
X_NUM = ERF_A[4] * Y_SQ;
X_DEN = Y_SQ;
- for (int i=0;i<3;i++)
- {
+ for (int i = 0; i < 3; i++) {
X_NUM = (X_NUM + ERF_A[i]) * Y_SQ;
X_DEN = (X_DEN + ERF_B[i]) * Y_SQ;
}
result = X * (X_NUM + ERF_A[3]) / (X_DEN + ERF_B[3]);
- if (jint != 0) result = 1 - result;
- if(jint == 2) result = Math.exp(Y_SQ) * result;
+ if (jint != 0) result = 1 - result;
+ if (jint == 2) result = Math.exp(Y_SQ) * result;
return result;
}
- else if (Y <= 4.0D)
- {
+ else if (Y <= 4.0D) {
X_NUM = ERF_C[8] * Y;
X_DEN = Y;
- for (int i=0;i<7;i++)
- {
+ for (int i = 0; i < 7; i++) {
X_NUM = (X_NUM + ERF_C[i]) * Y;
X_DEN = (X_DEN + ERF_D[i]) * Y;
}
result = (X_NUM + ERF_C[7]) / (X_DEN + ERF_D[7]);
- if(jint != 2)
- {
- Y_SQ = Math.round(Y*16.0D)/16.0D;
+ if (jint != 2) {
+ Y_SQ = Math.round(Y * 16.0D) / 16.0D;
double del = (Y - Y_SQ) * (Y + Y_SQ);
result = Math.exp(-Y_SQ * Y_SQ) * Math.exp(-del) * result;
}
}
- else
- {
+ else {
result = 0.0D;
- if( Y >= X_BIG && (jint != 2 || Y >= X_MAX));
- else if(Y >= X_BIG && Y >= X_HUGE) result = PI_SQRT / Y;
- else
- {
+ if (Y >= X_BIG && (jint != 2 || Y >= X_MAX))
+ ;
+ else if (Y >= X_BIG && Y >= X_HUGE)
+ result = PI_SQRT / Y;
+ else {
Y_SQ = 1.0D / (Y * Y);
X_NUM = ERF_P[5] * Y_SQ;
X_DEN = Y_SQ;
- for (int i=0;i<4; i++)
- {
+ for (int i = 0; i < 4; i++) {
X_NUM = (X_NUM + ERF_P[i]) * Y_SQ;
X_DEN = (X_DEN + ERF_Q[i]) * Y_SQ;
}
result = Y_SQ * (X_NUM + ERF_P[4]) / (X_DEN + ERF_Q[4]);
result = (PI_SQRT - result) / Y;
- if(jint != 2)
- {
- Y_SQ = Math.round(Y*16.0D)/16.0D;
+ if (jint != 2) {
+ Y_SQ = Math.round(Y * 16.0D) / 16.0D;
double del = (Y - Y_SQ) * (Y + Y_SQ);
result = Math.exp(-Y_SQ * Y_SQ) * Math.exp(-del) * result;
}
}
}
- if(jint == 0)
- {
+ if (jint == 0) {
result = (0.5D - result) + 0.5D;
- if(X < 0) result = -result;
+ if (X < 0) result = -result;
}
- else if(jint == 1)
- {
- if(X < 0) result = 2.0D - result;
+ else if (jint == 1) {
+ if (X < 0) result = 2.0D - result;
}
- else
- {
- if(X < 0)
- {
- if(X < X_NEG) result = X_INF;
- else
- {
- Y_SQ = Math.round(X*16.0D)/16.0D;
+ else {
+ if (X < 0) {
+ if (X < X_NEG)
+ result = X_INF;
+ else {
+ Y_SQ = Math.round(X * 16.0D) / 16.0D;
double del = (X - Y_SQ) * (X + Y_SQ);
Y = Math.exp(Y_SQ * Y_SQ) * Math.exp(del);
result = (Y + Y) - result;
@@ -272,17 +269,12 @@
}
}
return result;
- }
+ }
/**
- * Refining algorytm is based on Halley rational method for finding roots of
- * equations as described at:
- * http://www.math.uio.no/~jacklam/notes/invnorm/index.html by: Peter J.
- * Acklam jacklam at math.uio.no
- *
- * @param x
- * @param d
- * @return
+ * Refining algorytm is based on Halley rational method for finding roots of equations as
+ * described at: http://www.math.uio.no/~jacklam/notes/invnorm/index.html by: Peter J. Acklam
+ * jacklam at math.uio.no
*/
public static double refine(double x, double d) {
if (d > 0 && d < 1) {
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/ScenarioReport.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/ScenarioReport.java 2010-08-17 22:03:45 UTC (rev 6604)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/ScenarioReport.java 2010-08-18 02:53:16 UTC (rev 6605)
@@ -104,8 +104,6 @@
/**
* creates an XML document out of the observations
- *
- * @return
*/
public Document createDocument() {
//Document document = DocumentHelper.createDocument();
@@ -143,7 +141,7 @@
/**
* Convenience method after removing typo
*
- * @deprecated
+ * @deprecated call {@link #getCosts()} instead
*/
public double getCost() {
return getCosts();
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/StatUtil.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/StatUtil.java 2010-08-17 22:03:45 UTC (rev 6604)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/StatUtil.java 2010-08-18 02:53:16 UTC (rev 6605)
@@ -6,7 +6,6 @@
*
* More information can be found in the statistics chapter of my master thesis.
*
- *
* @author bernd.ruecker at camunda.com
*/
public class StatUtil {
@@ -18,11 +17,6 @@
* The confidence interval is calculated with the
* "Inverse Cumulative Standard Normal Distribution Function" and not the t distribution
* which requires a sample size of at least 30 to get qualitative results.
- *
- * @param confidenceLevel
- * @param standardDerivation
- * @param sampleSize
- * @return
*/
public static double getConfidenceIntervalSummand(double confidenceLevel, double standardDerivation, double sampleSize) {
// calculate Z
@@ -43,11 +37,6 @@
* The confidence interval is calculated with the
* "Inverse Cumulative Standard Normal Distribution Function" and not the t distribution
* which requires a sample size of at least 30 to get qualitative results.
- *
- * @param confidenceLevel
- * @param halfConfidenceIntervalWidth
- * @param standardDerivation
- * @return
*/
public static double getRequiredSampleSize(double confidenceLevel, double halfConfidenceIntervalWidth, double standardDerivation) {
// calculate Z
Modified: jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/pom.xml 2010-08-17 22:03:45 UTC (rev 6604)
+++ jbpm3/branches/jbpm-3.2-soa/modules/soa-distribution/pom.xml 2010-08-18 02:53:16 UTC (rev 6605)
@@ -45,50 +45,51 @@
<!-- Plugins -->
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-soa-common-build-src</id>
- <phase>process-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.basedir}</outputDirectory>
- <artifactItems>
- <artifactItem>
- <groupId>${soa_common_build_src.groupId}</groupId>
- <artifactId>${soa_common_build_src.artifactId}</artifactId>
- <version>${soa_common_build_src.version}</version>
- <type>zip</type>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
- <id>cp-jsf-console-soa</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jsf-console</artifactId>
- <version>3.2.10-SNAPSHOT</version>
- <classifier>soa</classifier>
- <type>war</type>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-soa-common-build-src</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.basedir}</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${soa_common_build_src.groupId}</groupId>
+ <artifactId>${soa_common_build_src.artifactId}</artifactId>
+ <version>${soa_common_build_src.version}</version>
+ <type>zip</type>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>cp-jsf-console-soa</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jsf-console</artifactId>
+ <version>3.2.10-SNAPSHOT</version>
+ <classifier>soa</classifier>
+ <type>war</type>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -127,26 +128,30 @@
<version>1.7.0</version>
</dependency>
</dependencies>
+
<executions>
<execution>
- <id>SOA-P build process</id>
- <phase>package</phase>
- <configuration>
- <tasks>
- <ant antfile="build-common.xml" target="soa.routine.build" dir="${project.basedir}" inheritAll="false">
- <property name="module_base_dir" value="${project.basedir}"/>
- <property name="module_build_finalName" value="${project.build.finalName}"/>
- <property name="project.version" value="${project.version}"/>
- <property name="groovy.path" value="${maven.dependency.org.codehaus.groovy.groovy-all.jar.path}" />
- </ant>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
+ <id>SOA-P build process</id>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <ant antfile="build-common.xml" target="soa.routine.build" dir="${project.basedir}"
+ inheritAll="false">
+ <property name="module_base_dir" value="${project.basedir}" />
+ <property name="module_build_finalName" value="${project.build.finalName}" />
+ <property name="project.version" value="${project.version}" />
+ <property name="groovy.path"
+ value="${maven.dependency.org.codehaus.groovy.groovy-all.jar.path}" />
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -170,5 +175,4 @@
</plugin>
</plugins>
</build>
-
</project>
Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-08-17 22:03:45 UTC (rev 6604)
+++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-08-18 02:53:16 UTC (rev 6605)
@@ -390,13 +390,6 @@
</plugin>
<plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <quiet>true</quiet>
- </configuration>
- </plugin>
-
- <plugin>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<releaseProfiles>release</releaseProfiles>
@@ -480,6 +473,9 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <quiet>true</quiet>
+ </configuration>
<executions>
<execution>
<goals>
@@ -514,6 +510,9 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <quiet>true</quiet>
+ </configuration>
<executions>
<execution>
<goals>
More information about the jbpm-commits
mailing list