License moved to Apache

paucarre · May 20, 2016 · 5e7dda0 · 5e7dda0
1 parent c56847a
commit 5e7dda0
Show file tree

Hide file tree

Showing 52 changed files with 253 additions and 390 deletions.
diff --git a/README.md b/README.md
@@ -103,4 +103,4 @@ Please refer to the [Developer Guide](doc/developer.md) for details.
 ## Copyright
 Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 You may use, distribute and modify this code under the
-terms of the [GPL v2 license](http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+terms of the [Apache License v2](http://www.apache.org/licenses/LICENSE-2.0.txt).
diff --git a/license.txt b/license.txt
diff --git a/src/scala/tiefvision-web/app/controllers/Application.scala b/src/scala/tiefvision-web/app/controllers/Application.scala
@@ -1,7 +1,7 @@
 /**
   * Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
   * You may use, distribute and modify this code under the
-  * terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+  * terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
   */
 package controllers
 

diff --git a/src/scala/tiefvision-web/app/controllers/TiefVisionResourcesAssets.scala b/src/scala/tiefvision-web/app/controllers/TiefVisionResourcesAssets.scala
@@ -1,7 +1,7 @@
 /**
   * Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
   * You may use, distribute and modify this code under the
-  * terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+  * terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
   */
 package controllers
 

diff --git a/src/scala/tiefvision-web/app/core/Accuracy.scala b/src/scala/tiefvision-web/app/core/Accuracy.scala
@@ -1,7 +1,7 @@
 /**
   * Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
   * You may use, distribute and modify this code under the
-  * terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+  * terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
   */
 
 package core

diff --git a/src/scala/tiefvision-web/app/core/Crop.scala b/src/scala/tiefvision-web/app/core/Crop.scala
@@ -1,7 +1,7 @@
 /**
   * Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
   * You may use, distribute and modify this code under the
-  * terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+  * terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
   */
 package core
 

diff --git a/src/scala/tiefvision-web/app/core/DatabaseProcessing.scala b/src/scala/tiefvision-web/app/core/DatabaseProcessing.scala
@@ -1,7 +1,7 @@
 /**
   * Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
   * You may use, distribute and modify this code under the
-  * terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+  * terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
   */
 package core
 

diff --git a/src/scala/tiefvision-web/app/core/ImageProcessing.scala b/src/scala/tiefvision-web/app/core/ImageProcessing.scala
@@ -1,7 +1,7 @@
 /**
   * Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
   * You may use, distribute and modify this code under the
-  * terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+  * terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
   */
 
 package core

diff --git a/src/scala/tiefvision-web/app/core/ImageSearchResult.scala b/src/scala/tiefvision-web/app/core/ImageSearchResult.scala
@@ -1,7 +1,7 @@
 /**
   * Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
   * You may use, distribute and modify this code under the
-  * terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+  * terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
   */
 package core
 

diff --git a/src/scala/tiefvision-web/app/core/TrainAndTestFiles.scala b/src/scala/tiefvision-web/app/core/TrainAndTestFiles.scala
@@ -1,7 +1,7 @@
 /**
   * Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
   * You may use, distribute and modify this code under the
-  * terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+  * terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
   */
 package core
 

diff --git a/src/scala/tiefvision-web/app/db/BoundingBoxQueryActions.scala b/src/scala/tiefvision-web/app/db/BoundingBoxQueryActions.scala
@@ -1,7 +1,7 @@
 /**
   * Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
   * You may use, distribute and modify this code under the
-  * terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+  * terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
   */
 package db
 

diff --git a/src/scala/tiefvision-web/app/db/BoundingBoxTable.scala b/src/scala/tiefvision-web/app/db/BoundingBoxTable.scala
@@ -1,7 +1,7 @@
 /**
   * Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
   * You may use, distribute and modify this code under the
-  * terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+  * terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
   */
 package db
 

diff --git a/src/scala/tiefvision-web/app/db/Dataset.scala b/src/scala/tiefvision-web/app/db/Dataset.scala
@@ -1,7 +1,7 @@
 /**
   * Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
   * You may use, distribute and modify this code under the
-  * terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+  * terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
   */
 package db
 import slick.driver.H2Driver.api._

diff --git a/src/scala/tiefvision-web/app/db/SimilarityQueryActions.scala b/src/scala/tiefvision-web/app/db/SimilarityQueryActions.scala
@@ -1,7 +1,7 @@
 /**
   * Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
   * You may use, distribute and modify this code under the
-  * terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+  * terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
   */
 package db
 

diff --git a/src/scala/tiefvision-web/app/db/SimilarityTable.scala b/src/scala/tiefvision-web/app/db/SimilarityTable.scala
@@ -1,7 +1,7 @@
 /**
   * Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
   * You may use, distribute and modify this code under the
-  * terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+  * terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
   */
 package db
 

diff --git a/src/scala/tiefvision-web/app/views/downloadTrainAndTestDataSets.scala.html b/src/scala/tiefvision-web/app/views/downloadTrainAndTestDataSets.scala.html
@@ -1,7 +1,7 @@
 @*
 * Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 * You may use, distribute and modify this code under the
-* terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+* terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 *@
 @(trainAndTestDataSets: core.TrainAndTestFiles)
 <html>

diff --git a/src/scala/tiefvision-web/app/views/editBoundingBox.scala.html b/src/scala/tiefvision-web/app/views/editBoundingBox.scala.html
@@ -1,7 +1,7 @@
 @*
 * Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 * You may use, distribute and modify this code under the
-* terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+* terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 *@
 @(image: String, boundingBoxOpt: Option[db.BoundingBox] = None)
 <html>

diff --git a/src/scala/tiefvision-web/app/views/similarityEditor.scala.html b/src/scala/tiefvision-web/app/views/similarityEditor.scala.html
@@ -1,7 +1,7 @@
 @*
 * Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 * You may use, distribute and modify this code under the
-* terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+* terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 *@
 @(imageSearchResult: core.ImageSearchResult, masterBase: String, bboxBase: String, positive: Option[String], negative: Option[String])
 @imageSearchResultDisplay = @{imageSearchResult.distanceToSimilarImages.take(15)}

diff --git a/src/scala/tiefvision-web/app/views/similarityFinder.scala.html b/src/scala/tiefvision-web/app/views/similarityFinder.scala.html
@@ -1,7 +1,7 @@
 @*
 * Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 * You may use, distribute and modify this code under the
-* terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+* terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 *@
 @(imageSearchResult: core.ImageSearchResult, isSupervised: Boolean, masterBase: String, bboxBase: String)
 @imageSearchResultDisplay = @{imageSearchResult.distanceToSimilarImages.take(5)}

diff --git a/src/scala/tiefvision-web/app/views/similarityFinderUploadForm.scala.html b/src/scala/tiefvision-web/app/views/similarityFinderUploadForm.scala.html
@@ -1,7 +1,7 @@
 @*
 * Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 * You may use, distribute and modify this code under the
-* terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+* terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 *@
 @import helper._
 <html>

diff --git a/src/scala/tiefvision-web/app/views/similarityGallery.scala.html b/src/scala/tiefvision-web/app/views/similarityGallery.scala.html
@@ -1,7 +1,7 @@
 @*
 * Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 * You may use, distribute and modify this code under the
-* terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+* terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 *@
 @(images: Seq[String], isSupervised: Boolean, page: Int, pageGroup: Int, pageGroups: Int)
 <html>

diff --git a/src/scala/tiefvision-web/build.sbt b/src/scala/tiefvision-web/build.sbt
@@ -1,7 +1,7 @@
 /**
   * Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
   * You may use, distribute and modify this code under the
-  * terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+  * terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
   */
 name := """tiefvision-web"""
 

diff --git a/src/scala/tiefvision-web/conf/application.conf b/src/scala/tiefvision-web/conf/application.conf
@@ -1,6 +1,6 @@
 # Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 # You may use, distribute and modify this code under the
-# terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+# terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 # Secret key
 play.crypto.secret = "changeme"

diff --git a/src/scala/tiefvision-web/conf/ddl.sql b/src/scala/tiefvision-web/conf/ddl.sql
@@ -1,6 +1,6 @@
 -- Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 -- You may use, distribute and modify this code under the
--- terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+-- terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 create table BOUNDING_BOX(
   file_name varchar(255) primary key,

diff --git a/src/scala/tiefvision-web/conf/logback.xml b/src/scala/tiefvision-web/conf/logback.xml
@@ -1,7 +1,7 @@
 <!--
 Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 You may use, distribute and modify this code under the
-terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 -->
 <configuration>
 

diff --git a/src/scala/tiefvision-web/conf/routes b/src/scala/tiefvision-web/conf/routes
@@ -1,6 +1,6 @@
 # Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 # You may use, distribute and modify this code under the
-# terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+# terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 # Bounding box editing
 GET     /bounding_box               controllers.Application.index

diff --git a/src/scala/tiefvision-web/project/plugins.sbt b/src/scala/tiefvision-web/project/plugins.sbt
@@ -1,7 +1,7 @@
 /**
   * Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
   * You may use, distribute and modify this code under the
-  * terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+  * terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
   */
 
 addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.6")

diff --git a/src/scala/tiefvision-web/public/javascripts/BoundingBoxEditor.js b/src/scala/tiefvision-web/public/javascripts/BoundingBoxEditor.js
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
  * You may use, distribute and modify this code under the
- * terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+ * terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
  */
 var BoundingBoxEditor = function (imageName, left, right, top, bottom) {
   var $scope = this;

diff --git a/src/torch/0-tiefvision-commons/is_gray.lua b/src/torch/0-tiefvision-commons/is_gray.lua
@@ -1,6 +1,6 @@
 -- Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 -- You may use, distribute and modify this code under the
--- terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+-- terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 local image = require 'image'
 

diff --git a/src/torch/0-tiefvision-commons/tiefvision_commons.lua b/src/torch/0-tiefvision-commons/tiefvision_commons.lua
@@ -1,6 +1,6 @@
 -- Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 -- You may use, distribute and modify this code under the
--- terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+-- terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 --
 -- Commmon utility methods that are used thoughout the other modules. They are mostly

diff --git a/src/torch/1-split-encoder-classifier/split-encoder-classifier.lua b/src/torch/1-split-encoder-classifier/split-encoder-classifier.lua
@@ -1,6 +1,6 @@
 -- Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 -- You may use, distribute and modify this code under the
--- terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+-- terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 --
 -- It Splits the (Alexnet-like) network into an encoder and a classifier

diff --git a/src/torch/10-similarity-searcher-cnn-db/search.lua b/src/torch/10-similarity-searcher-cnn-db/search.lua
@@ -1,6 +1,6 @@
 -- Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 -- You may use, distribute and modify this code under the
--- terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+-- terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 package.path = package.path .. ';../0-tiefvision-commons/?.lua'
 require 'inn'

diff --git a/src/torch/10-similarity-searcher-cnn-db/search_commons.lua b/src/torch/10-similarity-searcher-cnn-db/search_commons.lua
@@ -1,6 +1,6 @@
 -- Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 -- You may use, distribute and modify this code under the
--- terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+-- terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 local search_commons = {}
 

diff --git a/src/torch/11-similarity-searcher-cnn-file/search.lua b/src/torch/11-similarity-searcher-cnn-file/search.lua
@@ -1,6 +1,6 @@
 -- Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 -- You may use, distribute and modify this code under the
--- terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+-- terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 package.path = package.path .. ';../0-tiefvision-commons/?.lua;../6-bboxlib/?.lua;../9-similarity-db/?.lua;../8-similarity-db-cnn/?.lua;../10-similarity-searcher-cnn-db/?.lua'
 

diff --git a/src/torch/12-deeprank-train/deeprank-train.lua b/src/torch/12-deeprank-train/deeprank-train.lua
@@ -1,6 +1,6 @@
 -- Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 -- You may use, distribute and modify this code under the
--- terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+-- terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 package.path = package.path .. ';../0-tiefvision-commons/?.lua;./?.lua'
 

diff --git a/src/torch/13-deeprank-encoding/deeprank-encoding.lua b/src/torch/13-deeprank-encoding/deeprank-encoding.lua
@@ -1,6 +1,6 @@
 -- Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 -- You may use, distribute and modify this code under the
--- terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+-- terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 package.path = package.path .. ';../0-tiefvision-commons/?.lua;./?.lua'
 require 'nn'

diff --git a/src/torch/14-deeprank-db/deeprank-db.lua b/src/torch/14-deeprank-db/deeprank-db.lua
@@ -1,6 +1,6 @@
 -- Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 -- You may use, distribute and modify this code under the
--- terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+-- terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 package.path = package.path .. ';../0-tiefvision-commons/?.lua;./?.lua'
 require 'inn'

diff --git a/src/torch/14-deeprank-db/similarity_lib.lua b/src/torch/14-deeprank-db/similarity_lib.lua
@@ -1,6 +1,6 @@
 -- Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 -- You may use, distribute and modify this code under the
--- terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+-- terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 require 'torch'
 

diff --git a/src/torch/15-deeprank-searcher-db/search.lua b/src/torch/15-deeprank-searcher-db/search.lua
@@ -1,6 +1,6 @@
 -- Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 -- You may use, distribute and modify this code under the
--- terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+-- terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 package.path = package.path .. ';../0-tiefvision-commons/?.lua;../10-similarity-searcher-cnn-db/?.lua'
 require 'inn'

diff --git a/src/torch/2-encode-bounding-box-training-and-test-images/encode-training-and-test-images.lua b/src/torch/2-encode-bounding-box-training-and-test-images/encode-training-and-test-images.lua
@@ -1,6 +1,6 @@
 -- Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 -- You may use, distribute and modify this code under the
--- terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+-- terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 -- Uses the image encoder to encode the train and test
 -- data sets for the bounding box regression

diff --git a/src/torch/3-train-regression-bounding-box/locatorconv.lua b/src/torch/3-train-regression-bounding-box/locatorconv.lua
@@ -1,6 +1,6 @@
 -- Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 -- You may use, distribute and modify this code under the
--- terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+-- terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 require "inn"
 require 'optim'

diff --git a/src/torch/3-train-regression-bounding-box/test-regression-bounding-box.lua b/src/torch/3-train-regression-bounding-box/test-regression-bounding-box.lua
@@ -1,6 +1,6 @@
 -- Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 -- You may use, distribute and modify this code under the
--- terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+-- terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 package.path = package.path .. ';./?.lua'
 require 'inn'

diff --git a/src/torch/3-train-regression-bounding-box/train-regression-bounding-box.lua b/src/torch/3-train-regression-bounding-box/train-regression-bounding-box.lua
@@ -1,6 +1,6 @@
 -- Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 -- You may use, distribute and modify this code under the
--- terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+-- terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 package.path = package.path .. ';./?.lua;../0-tiefvision-commons/?.lua'
 require 'inn'

diff --git a/src/torch/4-encode-classification-train-and-test-images/encode-training-and-test-images.lua b/src/torch/4-encode-classification-train-and-test-images/encode-training-and-test-images.lua
@@ -1,6 +1,6 @@
 -- Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 -- You may use, distribute and modify this code under the
--- terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+-- terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 package.path = package.path .. ';../0-tiefvision-commons/?.lua'
 require 'nn'

diff --git a/src/torch/5-train-classification/classifier-conv.lua b/src/torch/5-train-classification/classifier-conv.lua
@@ -1,6 +1,6 @@
 -- Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 -- You may use, distribute and modify this code under the
--- terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+-- terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 require "inn"
 require 'optim'

diff --git a/src/torch/5-train-classification/train-classification.lua b/src/torch/5-train-classification/train-classification.lua
@@ -1,6 +1,6 @@
 -- Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 -- You may use, distribute and modify this code under the
--- terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+-- terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 package.path = package.path .. ';../0-tiefvision-commons/?.lua;./?.lua'
 require 'inn'

diff --git a/src/torch/6-bboxlib/bboxlib.lua b/src/torch/6-bboxlib/bboxlib.lua
@@ -1,6 +1,6 @@
 -- Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 -- You may use, distribute and modify this code under the
--- terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+-- terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 package.path = package.path .. ';../0-tiefvision-commons/?.lua'
 require 'inn'

diff --git a/src/torch/7-bboxes-images/bboxes-images.lua b/src/torch/7-bboxes-images/bboxes-images.lua
@@ -1,6 +1,6 @@
 -- Copyright (C) 2016 Pau Carré Cardona - All Rights Reserved
 -- You may use, distribute and modify this code under the
--- terms of the GPL v2 license (http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+-- terms of the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt).
 
 package.path = package.path .. ';../0-tiefvision-commons/?.lua;../6-bboxlib/?.lua'
 require 'inn'