Merge branch 'DEV5.0' of https://github.com/p2t2/figaro into DEV5.0

charles-river-analytics · Aug 17, 2017 · 2e73dfe · 2e73dfe
2 parents 4e628ca + a1b3a41
commit 2e73dfe
Show file tree

Hide file tree

Showing 62 changed files with 333 additions and 1,357 deletions.
diff --git a/Figaro/src/main/scala/com/cra/figaro/algorithm/Anytime.scala b/Figaro/src/main/scala/com/cra/figaro/algorithm/Anytime.scala
@@ -11,6 +11,12 @@
  * See http://www.github.com/p2t2/figaro for a copy of the software license.
  */
 
+/*
+ * Additional Updates from our community
+ * 
+ * Paul Philips		May 23, 2017
+ */
+
 package com.cra.figaro.algorithm
 
 import com.cra.figaro.language._

diff --git a/Figaro/src/main/scala/com/cra/figaro/algorithm/ProbQueryAlgorithm.scala b/Figaro/src/main/scala/com/cra/figaro/algorithm/ProbQueryAlgorithm.scala
@@ -11,6 +11,13 @@
  * See http://www.github.com/p2t2/figaro for a copy of the software license.
  */
 
+/*
+ * Additional Updates from our community
+ * 
+ * Cagdas Senol		Jul 3, 2016
+ * Cagdas Senol		Jul 16, 2016
+ */
+
 package com.cra.figaro.algorithm
 
 import com.cra.figaro.language._

diff --git a/Figaro/src/main/scala/com/cra/figaro/algorithm/factored/factors/factory/Factory.scala b/Figaro/src/main/scala/com/cra/figaro/algorithm/factored/factors/factory/Factory.scala
@@ -11,6 +11,12 @@
  * See http://www.github.com/p2t2/figaro for a copy of the software license.
  */
 
+/*
+ * Additional Updates from our community
+ * 
+ * Paul Philips		May 23, 2017
+ */
+
 package com.cra.figaro.algorithm.factored.factors.factory
 
 import com.cra.figaro.algorithm._

diff --git a/Figaro/src/main/scala/com/cra/figaro/algorithm/learning/GeneralizedEM.scala b/Figaro/src/main/scala/com/cra/figaro/algorithm/learning/GeneralizedEM.scala
@@ -11,6 +11,12 @@
  * See http://www.github.com/p2t2/figaro for a copy of the software license.
  */
 
+/*
+ * Additional Updates from our community
+ * 
+ * Paul Philips		May 23, 2017
+ */
+
 package com.cra.figaro.algorithm.learning
 
 import com.cra.figaro.language._

diff --git a/Figaro/src/main/scala/com/cra/figaro/algorithm/learning/SufficientStatisticsFactor.scala b/Figaro/src/main/scala/com/cra/figaro/algorithm/learning/SufficientStatisticsFactor.scala
@@ -11,6 +11,12 @@
  * See http://www.github.com/p2t2/figaro for a copy of the software license.
  */
 
+/*
+ * Additional Updates from our community
+ * 
+ * Paul Philips		May 23, 2017
+ */
+
 package com.cra.figaro.algorithm.learning
 
 import com.cra.figaro.algorithm._

diff --git a/Figaro/src/main/scala/com/cra/figaro/algorithm/sampling/Importance.scala b/Figaro/src/main/scala/com/cra/figaro/algorithm/sampling/Importance.scala
@@ -11,6 +11,12 @@
  * See http://www.github.com/p2t2/figaro for a copy of the software license.
  */
 
+/*
+ * Additional Updates from our community
+ * 
+ * Kartik Thakore	Jul 21, 2015
+ */
+
 package com.cra.figaro.algorithm.sampling
 
 import com.cra.figaro.algorithm._

diff --git a/Figaro/src/main/scala/com/cra/figaro/algorithm/structured/Range.scala b/Figaro/src/main/scala/com/cra/figaro/algorithm/structured/Range.scala
@@ -11,6 +11,12 @@
  * See http://www.github.com/p2t2/figaro for a copy of the software license.
  */
 
+/*
+ * Additional Updates from our community
+ * 
+ * Paul Philips		May 23, 2017
+ */
+
 package com.cra.figaro.algorithm.structured
 
 import com.cra.figaro.algorithm.lazyfactored.ValueSet

diff --git a/Figaro/src/main/scala/com/cra/figaro/experimental/particlebp/ParticleBeliefPropagation.scala b/Figaro/src/main/scala/com/cra/figaro/experimental/particlebp/ParticleBeliefPropagation.scala
@@ -11,6 +11,12 @@
  * See http://www.github.com/p2t2/figaro for a copy of the software license.
  */
 
+/*
+ * Additional Updates from our community
+ * 
+ * Paul Philips		May 23, 2017
+ */
+
 package com.cra.figaro.experimental.particlebp
 
 import com.cra.figaro.language._

diff --git a/Figaro/src/main/scala/com/cra/figaro/language/ApplyC.scala b/Figaro/src/main/scala/com/cra/figaro/language/ApplyC.scala
@@ -11,11 +11,14 @@
  * See http://www.github.com/p2t2/figaro for a copy of the software license.
  */
 
-package com.cra.figaro.language
+/*
+ * Additional Updates from our community
+ * 
+ * Cagdas Senol		May 30, 2016
+ */
 
-/**
+package com.cra.figaro.language
 
-  */
 object ApplyC {
   /**
     * Application of a function to one argument.

diff --git a/Figaro/src/main/scala/com/cra/figaro/language/Continuous.scala b/Figaro/src/main/scala/com/cra/figaro/language/Continuous.scala
@@ -11,6 +11,12 @@
  * See http://www.github.com/p2t2/figaro for a copy of the software license.
  */
 
+/*
+ * Additional Updates from our community
+ * 
+ * Synapski		Oct 13, 2014
+ */
+
 package com.cra.figaro.language
 
 /**

diff --git a/Figaro/src/main/scala/com/cra/figaro/language/Element.scala b/Figaro/src/main/scala/com/cra/figaro/language/Element.scala
@@ -11,6 +11,12 @@
  * See http://www.github.com/p2t2/figaro for a copy of the software license.
  */
 
+/*
+ * Additional Updates from our community
+ * 
+ * Martin Mauch		Dec 19, 2013
+ */
+
 package com.cra.figaro.language
 
 import com.cra.figaro.library.compound._

diff --git a/Figaro/src/main/scala/com/cra/figaro/library/atomic/continuous/Beta.scala b/Figaro/src/main/scala/com/cra/figaro/library/atomic/continuous/Beta.scala
@@ -11,6 +11,12 @@
  * See http://www.github.com/p2t2/figaro for a copy of the software license.
  */
 
+/*
+ * Additional Updates from our community
+ * 
+ * Synapski		Oct 13, 2014
+ */
+
 package com.cra.figaro.library.atomic.continuous
 
 import scala.language.implicitConversions

diff --git a/Figaro/src/main/scala/com/cra/figaro/library/atomic/continuous/Dirichlet.scala b/Figaro/src/main/scala/com/cra/figaro/library/atomic/continuous/Dirichlet.scala
@@ -11,6 +11,13 @@
  * See http://www.github.com/p2t2/figaro for a copy of the software license.
  */
 
+/*
+ * Additional Updates from our community
+ * 
+ * Synapski		Oct 13, 2014
+ * Paul Philips		May 23, 2017
+ */
+
 package com.cra.figaro.library.atomic.continuous
 
 import scala.collection.mutable

diff --git a/Figaro/src/main/scala/com/cra/figaro/library/atomic/continuous/Exponential.scala b/Figaro/src/main/scala/com/cra/figaro/library/atomic/continuous/Exponential.scala
@@ -11,6 +11,12 @@
  * See http://www.github.com/p2t2/figaro for a copy of the software license.
  */
 
+/*
+ * Additional Updates from our community
+ * 
+ * Synapski		Oct 13, 2014
+ */
+
 package com.cra.figaro.library.atomic.continuous
 
 import com.cra.figaro.language._

diff --git a/Figaro/src/main/scala/com/cra/figaro/library/atomic/continuous/Gamma.scala b/Figaro/src/main/scala/com/cra/figaro/library/atomic/continuous/Gamma.scala
@@ -11,6 +11,12 @@
  * See http://www.github.com/p2t2/figaro for a copy of the software license.
  */
 
+/*
+ * Additional Updates from our community
+ * 
+ * Synapski		Oct 13, 2014
+ */
+
 package com.cra.figaro.library.atomic.continuous
 
 import com.cra.figaro.language._

diff --git a/Figaro/src/main/scala/com/cra/figaro/library/atomic/continuous/Normal.scala b/Figaro/src/main/scala/com/cra/figaro/library/atomic/continuous/Normal.scala
@@ -11,6 +11,12 @@
  * See http://www.github.com/p2t2/figaro for a copy of the software license.
  */
 
+/*
+ * Additional Updates from our community
+ * 
+ * Synapski		Oct 13, 2014
+ */
+
 package com.cra.figaro.library.atomic.continuous
 
 import com.cra.figaro.language._

diff --git a/Figaro/src/main/scala/com/cra/figaro/library/atomic/continuous/Uniform.scala b/Figaro/src/main/scala/com/cra/figaro/library/atomic/continuous/Uniform.scala
@@ -11,6 +11,12 @@
  * See http://www.github.com/p2t2/figaro for a copy of the software license.
  */
 
+/*
+ * Additional Updates from our community
+ * 
+ * Synapski		Oct 13, 2014
+ */
+
 package com.cra.figaro.library.atomic.continuous
 
 import com.cra.figaro.language._

diff --git a/Figaro/src/main/scala/com/cra/figaro/patterns/learning/ModelParameters.scala b/Figaro/src/main/scala/com/cra/figaro/patterns/learning/ModelParameters.scala
@@ -11,6 +11,12 @@
  * See http://www.github.com/p2t2/figaro for a copy of the software license.
  */
 
+/*
+ * Additional Updates from our community
+ * 
+ * Paul Philips		May 23, 2017
+ */
+
 package com.cra.figaro.patterns.learning
 
 import com.cra.figaro.language.Element

diff --git a/Figaro/src/main/scala/com/cra/figaro/util/package.scala b/Figaro/src/main/scala/com/cra/figaro/util/package.scala
@@ -11,6 +11,12 @@
  * See http://www.github.com/p2t2/figaro for a copy of the software license.
  */
 
+/*
+ * Additional Updates from our community
+ * 
+ * Synapski		Oct 13, 2014
+ */
+
 package com.cra.figaro
 
 import scala.annotation.tailrec

diff --git a/Figaro/src/main/scala/com/cra/figaro/util/visualization/DataView.scala b/Figaro/src/main/scala/com/cra/figaro/util/visualization/DataView.scala