[Bigdata-commit] SF.net SVN: bigdata:[7969] branches

[<tho...@us...>]

Revision: 7969
          http://sourceforge.net/p/bigdata/code/7969
Author:   thompsonbry
Date:     2014-03-14 21:39:12 +0000 (Fri, 14 Mar 2014)
Log Message:
-----------
Modified build.xml in the main branch and the RDR branch to fix the javadoc build.

Removed a character in both branches in the PR.java file that was causing problems with javadoc generation (non-UTF-8).

See #810 (Expose GAS Service)

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata-gas/src/java/com/bigdata/rdf/graph/analytics/PR.java
    branches/BIGDATA_RELEASE_1_3_0/build.xml
    branches/RDR/bigdata-gas/src/java/com/bigdata/rdf/graph/analytics/PR.java
    branches/RDR/build.xml

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-gas/src/java/com/bigdata/rdf/graph/analytics/PR.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-gas/src/java/com/bigdata/rdf/graph/analytics/PR.java	2014-03-14 21:23:52 UTC (rev 7968)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-gas/src/java/com/bigdata/rdf/graph/analytics/PR.java	2014-03-14 21:39:12 UTC (rev 7969)
@@ -54,7 +54,7 @@
  * <dd>sum( neighbor_value / neighbor_num_out_edges ) over the in-edges of the
  * graph.</dd>
  * <dt>Apply</dt>
- * <dd>value = <i>resetProb</i> + (1.0 \xD0 <i>resetProb</i>) * gatherSum</dd>
+ * <dd>value = <i>resetProb</i> + (1.0 - <i>resetProb</i>) * gatherSum</dd>
  * <dt>Scatter</dt>
  * <dd>if (a) value has significantly changed <code>(fabs(old-new) GT
  * <i>epsilon</i>)</code>; or (b) iterations LT limit</dd>

Modified: branches/BIGDATA_RELEASE_1_3_0/build.xml
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/build.xml	2014-03-14 21:23:52 UTC (rev 7968)
+++ branches/BIGDATA_RELEASE_1_3_0/build.xml	2014-03-14 21:39:12 UTC (rev 7969)
@@ -385,9 +385,6 @@
 			    overview="${bigdata.dir}/overview.html"
 			 windowtitle="bigdata&#174; v${build.ver}"
 			classpathref="build.classpath"
-			package="true"
-			protected="true"
-			public="true"
 			private="false"
 			>
 			<arg value="-J-Xmx1000m" />
@@ -401,6 +398,7 @@
 			<packageset dir="${bigdata.dir}/bigdata-sails/src/samples" />
          <packageset dir="${bigdata.dir}/bigdata-gom/src/java" />
          <packageset dir="${bigdata.dir}/bigdata-gom/src/samples" />
+         <packageset dir="${bigdata.dir}/bigdata-gas/src/java" />
 			<packageset dir="${bigdata.dir}/ctc-striterators/src/java" />
 			<doctitle>
 				<![CDATA[<h1>bigdata&#174; v${build.ver}</h1>]]></doctitle>

Modified: branches/RDR/bigdata-gas/src/java/com/bigdata/rdf/graph/analytics/PR.java
===================================================================
--- branches/RDR/bigdata-gas/src/java/com/bigdata/rdf/graph/analytics/PR.java	2014-03-14 21:23:52 UTC (rev 7968)
+++ branches/RDR/bigdata-gas/src/java/com/bigdata/rdf/graph/analytics/PR.java	2014-03-14 21:39:12 UTC (rev 7969)
@@ -55,7 +55,7 @@
  * <dd>sum( neighbor_value / neighbor_num_out_edges ) over the in-edges of the
  * graph.</dd>
  * <dt>Apply</dt>
- * <dd>value = <i>resetProb</i> + (1.0 \xD0 <i>resetProb</i>) * gatherSum</dd>
+ * <dd>value = <i>resetProb</i> + (1.0 - <i>resetProb</i>) * gatherSum</dd>
  * <dt>Scatter</dt>
  * <dd>if (a) value has significantly changed <code>(fabs(old-new) GT
  * <i>epsilon</i>)</code>; or (b) iterations LT limit</dd>

Modified: branches/RDR/build.xml
===================================================================
--- branches/RDR/build.xml	2014-03-14 21:23:52 UTC (rev 7968)
+++ branches/RDR/build.xml	2014-03-14 21:39:12 UTC (rev 7969)
@@ -394,9 +394,6 @@
 			    overview="${bigdata.dir}/overview.html"
 			 windowtitle="bigdata&#174; v${build.ver}"
 			classpathref="build.classpath"
-			package="true"
-			protected="true"
-			public="true"
 			private="false"
 			>
 			<arg value="-J-Xmx1000m" />
@@ -410,6 +407,7 @@
 			<packageset dir="${bigdata.dir}/bigdata-sails/src/samples" />
          <packageset dir="${bigdata.dir}/bigdata-gom/src/java" />
          <packageset dir="${bigdata.dir}/bigdata-gom/src/samples" />
+         <packageset dir="${bigdata.dir}/bigdata-gas/src/java" />
 			<packageset dir="${bigdata.dir}/ctc-striterators/src/java" />
 			<doctitle>
 				<![CDATA[<h1>bigdata&#174; v${build.ver}</h1>]]></doctitle>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.