melezov · Jul 31, 2012 · Jul 31, 2012 · Jul 31, 2012 · Jul 31, 2012 · Aug 1, 2012
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,18 @@
 .cache
 .classpath
+.history
 .project
 .scala_dependencies
 .settings
 target
 .target
 
-project/strap/sbt-launch-*.jar
+*.~
+
+sbt-launch-*.jar
+
+*.log
+*.pyc
+
+code/scala/Lift/src/main/static/coffee-js/*.js
+code/scala/Lift/src/main/static/less-css/*.css
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "shared"]
+	path = shared
+	url = git://github.com/element-doo/shared-static.git
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,26 @@
+Copyright (c) 2012, Instantor AB
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+3. Neither the name of the Instantor AB nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/README b/README
@@ -1,10 +1,9 @@
 
-    FUZZY STRING MATCHING   
-
+    NAME COMPARISON PROJECT
 
  *  FuzzyMatch.apply is a method for comparing 2 names, that uses Levenshtein algorithm.
  *  The Levenshtein algorithm (also called Edit-Distance) calculates the
- *  least number of edit operations that are necessary to modify one string to obtain another string.
+ *  least number of edit operations that are necessary to modify one string to become an another string.
  *
  *  Method FuzzyMatch.apply returns 0 to 1 correlation between 2 names.
  *
@@ -13,6 +12,9 @@
  *  1. Transliterated
  *  2. Alphabetically sorted
  *  3. Converted to lowercase and trimmed for extra whitespaces
-
-
-
+ *
+ *  Additionally, specialised handlers have been created for special cases of names
+ *  containing hyphens or names which have been shortened to initials.
+ *
+ *  A live demo of this code is available on the Instantor sandbox server at:
+ *  https://platform.instantor.com/sandbox/name-compare/
diff --git a/build.sbt b/build.sbt
diff --git a/code/scala/Core/build.sbt b/code/scala/Core/build.sbt
@@ -0,0 +1,40 @@
+name := "Name-Compare"
+
+version := "0.1.1-3"
+
+organization := "hr.element.etb"
+
+crossScalaVersions := Seq("2.10.4", "2.9.2", "2.9.1-1", "2.9.1", "2.9.0-1", "2.9.0")
+
+scalaVersion := crossScalaVersions.value.head
+
+scalacOptions := Seq("-unchecked", "-deprecation", "-encoding", "UTF-8", "-optimise")
+
+unmanagedSourceDirectories in Compile := Seq((scalaSource in Compile).value)
+
+unmanagedSourceDirectories in Test := Seq((scalaSource in Test).value)
+
+resolvers := Seq("Element Nexus" at "http://repo.element.hr/nexus/content/groups/public/")
+
+externalResolvers <<= resolvers map ( rs =>
+  Resolver.withDefaultResolvers(rs, mavenCentral = false)
+)
+
+libraryDependencies := Seq(
+  "com.ibm.icu" % "icu4j" % "49.1"
+, "uk.ac.shef.wit" % "simmetrics" % "1.6.2"
+, "org.scalatest" %% "scalatest" % "2.0" % "test"
+)
+
+publishTo <<= (version) ( v => Some(
+  if (v endsWith "SNAPSHOT") {
+    "Element Snapshots" at "http://repo.element.hr/nexus/content/repositories/snapshots/"
+  }
+  else {
+    "Element Releases" at "http://repo.element.hr/nexus/content/repositories/releases/"
+  }
+))
+
+credentials += Credentials(Path.userHome / ".publish" / "element.credentials")
+
+publishArtifact in (Compile, packageDoc) := false
diff --git a/code/scala/Core/continuous-compilation.bat b/code/scala/Core/continuous-compilation.bat
@@ -0,0 +1,4 @@
+@echo off
+
+echo Entering continuous compilation loop ...
+call "%~dp0\sbt.bat" --loop --no-jrebel %* ~compile
diff --git a/code/scala/Core/continuous-compilation.sh b/code/scala/Core/continuous-compilation.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo Entering continuous compilation loop ...
+`dirname $0`/sbt.sh --loop --no-jrebel "$@" ~compile
diff --git a/code/scala/Core/cross-publish.bat b/code/scala/Core/cross-publish.bat
@@ -0,0 +1,4 @@
+@echo off
+
+echo Will cross-publish project to the maven server
+call "%~dp0sbt.bat" %* clean +publish
diff --git a/code/scala/Core/cross-publish.sh b/code/scala/Core/cross-publish.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo Will cross-publish project to the maven server
+`dirname $0`/sbt.sh --no-jrebel "$@" clean +publish
diff --git a/code/scala/Core/open-console.bat b/code/scala/Core/open-console.bat
@@ -0,0 +1,4 @@
+@echo off
+
+echo Firing up the Scala REPL ...
+call "%~dp0\sbt.bat" %* console
diff --git a/code/scala/Core/open-console.sh b/code/scala/Core/open-console.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo Firing up the Scala REPL ...
+`dirname $0`/sbt.sh "$@" console
diff --git a/code/scala/Core/prepare-workspace.bat b/code/scala/Core/prepare-workspace.bat
@@ -0,0 +1,5 @@
+@echo off
+
+echo Performing dependency update for all projects ...
+echo Will also create Eclipse .project and .classpath files ...
+call "%~dp0\sbt.bat" --no-jrebel %* update eclipse
diff --git a/code/scala/Core/prepare-workspace.sh b/code/scala/Core/prepare-workspace.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+echo Performing dependency update for all projects ...
+echo Will also create Eclipse .project and .classpath files ...
+`dirname $0`/sbt.sh --no-jrebel "$@" update eclipse
diff --git a/code/scala/Core/project/build.properties b/code/scala/Core/project/build.properties
@@ -0,0 +1 @@
+sbt.version=0.13.5
diff --git a/project/plugins.sbt → code/scala/Core/project/plugins.sbt b/project/plugins.sbt → code/scala/Core/project/plugins.sbt
@@ -1,3 +1,12 @@
+resolvers := Seq(
+  "Element Nexus" at "http://repo.element.hr/nexus/content/groups/public/"
+, Resolver.url("Element Nexus (Ivy)", url("http://repo.element.hr/nexus/content/groups/public/"))(Resolver.ivyStylePatterns)
+)
+
+externalResolvers := Resolver.withDefaultResolvers(resolvers.value, mavenCentral = false)
+
+// =======================================================================================
+
 // +-------------------------------------------------------------------------------------+
 // | SBT Eclipse (https://github.com/typesafehub/sbteclipse)                             |
 // | Creates .project and .classpath files for easy Eclipse project imports              |
@@ -6,17 +15,11 @@
 // | See also: Scala IDE downloads (http://download.scala-ide.org/)                      |
 // +-------------------------------------------------------------------------------------+
 
-resolvers += Classpaths.typesafeResolver
-
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.0.0")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.5.0")
 
 // +-------------------------------------------------------------------------------------+
-// | SBT Scalariform (https://github.com/typesafehub/sbtscalariform)                     |
-// | Performs source code formatting                                                     |
-// |                                                                                     |
-// | See also: Scalariform reference (http://mdr.github.com/scalariform/)                |
+// | Dependency graph SBT plugin (https://github.com/jrudolph/sbt-dependency-graph)      |
+// | Lists all library dependencies in a nicely formatted way for easy inspection.       |
 // +-------------------------------------------------------------------------------------+
 
-resolvers += Classpaths.typesafeResolver
-
-addSbtPlugin("com.typesafe.sbtscalariform" % "sbtscalariform" % "0.3.0")
+addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.4")
diff --git a/code/scala/Core/project/strap/gruj_vs_sbt-launch-0.13.x.jar b/code/scala/Core/project/strap/gruj_vs_sbt-launch-0.13.x.jar
diff --git a/code/scala/Core/project/strap/sbt.boot.properties b/code/scala/Core/project/strap/sbt.boot.properties
@@ -0,0 +1,28 @@
+[scala]
+  version: ${sbt.scala.version-auto}
+
+[app]
+  org: ${sbt.organization-org.scala-sbt}
+  name: sbt
+  version: ${sbt.version-read(sbt.version)[0.13.5]}
+  class: ${sbt.main.class-sbt.xMain}
+  components: xsbti,extra
+  cross-versioned: ${sbt.cross.versioned-false}
+  resources: ${sbt.extraClasspath-}
+
+[repositories]
+  local
+  element-nexus: http://maven.element.hr/nexus/content/groups/public/
+  element-nexus-ivy: http://maven.element.hr/nexus/content/groups/public/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
+
+[boot]
+  directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/}
+
+[ivy]
+  ivy-home: ${sbt.ivy.home-${user.home}/.ivy2/name-compare}
+  checksums: ${sbt.checksums-sha1,md5}
+  override-build-repos: ${sbt.override.build.repos-false}
+  repository-config: ${sbt.repository.config-${sbt.global.base-${user.home}/.sbt}/repositories}
+
+[log]
+  level: info
diff --git a/code/scala/Core/sbt.bat b/code/scala/Core/sbt.bat
@@ -0,0 +1,75 @@
+@echo off
+setlocal
+pushd
+cd "%~dp0"
+
+set JVM_PARAMS=-Xss2m -Xmx712m -XX:MaxPermSize=256m -XX:+CMSClassUnloadingEnabled
+
+set LIFT_RUN_MODE=-Drun.mode=development
+set TRY_JREBEL=true
+set LOG_LEVEL=
+set NO_PAUSE=false
+set DO_LOOP=false
+
+:PARSER_LOOP
+if "%~1"=="" goto :PARSER_END
+
+if "%~1"=="--prod" (
+  set LIFT_RUN_MODE=-Drun.mode=production
+  goto :PARSER_CONTINUE
+)
+
+if "%~1"=="--debug" (
+  set LOG_LEVEL="set logLevel:=Level.Debug"
+  goto :PARSER_CONTINUE
+)
+
+if "%~1"=="~lift" (
+  set SBT_PARAMS=%SBT_PARAMS% container:start ~compile container:stop
+  set JREBEL_PLUGINS=%JREBEL_PLUGINS% -Drebel.lift_plugin=true
+  goto :PARSER_CONTINUE
+)
+
+if "%~1"=="--no-jrebel" (
+  set TRY_JREBEL=false
+  goto :PARSER_CONTINUE
+)
+
+if "%~1"=="--loop" (
+  set DO_LOOP=true
+  goto :PARSER_CONTINUE
+)
+
+if "%~1"=="--no-pause" (
+  set NO_PAUSE=true
+  goto :PARSER_CONTINUE
+)
+
+set SBT_PARAMS=%SBT_PARAMS% %1
+
+:PARSER_CONTINUE
+shift
+goto :PARSER_LOOP
+:PARSER_END
+
+set JVM_PARAMS=%JVM_PARAMS% %LIFT_RUN_MODE%
+if %TRY_JREBEL%.==true. (
+  if exist "%JREBEL_HOME%\jrebel.jar" set JVM_PARAMS=%JVM_PARAMS% -noverify -javaagent:"%JREBEL_HOME%\jrebel.jar" %JREBEL_PLUGINS%
+)
+
+set GRUJ_PATH=project\strap\gruj_vs_sbt-launch-0.13.x.jar
+set RUN_CMD=java %JVM_PARAMS% -jar %GRUJ_PATH% %LOG_LEVEL% %SBT_PARAMS%
+
+:RUN_LOOP
+%RUN_CMD%
+
+if %DO_LOOP%.==true. (
+  if %NO_PAUSE%.==false. (
+    echo Press Enter to continue or Press CTRL+C to exit!
+    pause
+  )
+  goto :RUN_LOOP
+)
+
+popd
+endlocal
diff --git a/sbt.sh → code/scala/Core/sbt.sh b/sbt.sh → code/scala/Core/sbt.sh
@@ -2,7 +2,7 @@
 cd `dirname $0`
 
 ## START JVM PARAMS
-JVM_PARAMS="-Xss2m -Xmx1g -XX:MaxPermSize=256m -XX:+CMSClassUnloadingEnabled"
+JVM_PARAMS="-Xss2m -Xmx712m -XX:MaxPermSize=256m -XX:+CMSClassUnloadingEnabled"
 
 LIFT_RUN_MODE="-Drun.mode=development"
 TRY_JREBEL=true
@@ -51,7 +51,7 @@ if $TRY_JREBEL && [ -n "$JREBEL_HOME" ] && [ -f $JREBEL_HOME/jrebel.jar ]; then
   JVM_PARAMS="$JVM_PARAMS -noverify -javaagent:$JREBEL_HOME/jrebel.jar $JREBEL_PLUGINS"
 fi
 
-GRUJ_PATH="project/strap/gruj_vs_sbt-launch-0.11.2.jar"
+GRUJ_PATH="project/strap/gruj_vs_sbt-launch-0.13.x.jar"
 RUN_CMD="java $JVM_PARAMS -jar $GRUJ_PATH $LOG_LEVEL $SBT_PARAMS"
 
 LOOPING=true

diff --git a/code/scala/Core/src/main/scala/hr/element/etb/name_compare/ComparisonDecision.scala b/code/scala/Core/src/main/scala/hr/element/etb/name_compare/ComparisonDecision.scala
@@ -0,0 +1,32 @@
+package hr.element.etb.name_compare
+
+sealed abstract class ComparisonDecision(
+    val decision: String
+  , val isOk: Boolean
+  , val description: String
+  , val percentage: Float) {
+
+  override val toString = "%s (%s: %.0f%%)" format(
+    decision
+  , description
+  , percentage * 100
+  )
+}
+
+case object IdenticalMatch
+    extends ComparisonDecision("Yes", true, "Identical match", 1f)
+
+case class DirectMatch(override val percentage: Float)
+    extends ComparisonDecision("Yes", true, "There was a direct match", percentage)
+
+case class InitialsMatch(override val percentage: Float)
+    extends ComparisonDecision("Maybe", true, "There was a match via initials", percentage)
+
+case class HyphenMatch(override val percentage: Float)
+    extends ComparisonDecision("Maybe", true, "There was a match via hyphens", percentage)
+
+case class NoMatch(override val percentage: Float)
+    extends ComparisonDecision("No", false, "There was no match", percentage)
+
+case object MatchError
+    extends ComparisonDecision("No", false, "There was an error", 0f)