From 2bb305c6e431afbaa5a5edaa6c9f9b5dfd6ff54b Mon Sep 17 00:00:00 2001 From: Robert Ricci <ricci@cs.utah.edu> Date: Tue, 10 May 2005 16:45:23 +0000 Subject: [PATCH] Add missing copyrights. --- tbsetup/ipassign/dre/GNUmakefile | 5 +++++ tbsetup/ipassign/dre/dijkstra.ml | 6 ++++++ tbsetup/ipassign/dre/dre.ml | 6 ++++++ tbsetup/ipassign/dre/ga.ml | 8 ++++++-- tbsetup/ipassign/dre/graph.ml | 7 +++++++ tbsetup/ipassign/dre/graph2dot.ml | 6 ++++++ tbsetup/ipassign/dre/heap.ml | 7 +++++++ tbsetup/ipassign/dre/test-dijk.ml | 6 ++++++ tbsetup/ipassign/dre/test-dre.ml | 6 ++++++ tbsetup/ipassign/dre/test-heap.ml | 6 ++++++ tbsetup/ipassign/src/CutSearchPartition.h | 6 ++++++ tbsetup/ipassign/src/GraphConverter.h | 6 ++++++ tbsetup/ipassign/src/RatioCutPartition.h | 6 ++++++ tbsetup/ipassign/src/add-x.cc | 6 ++++++ tbsetup/ipassign/src/difference.cc | 6 ++++++ tbsetup/ipassign/src/graph2single-source.cc | 6 ++++++ tbsetup/ipassign/src/route2dist.cc | 6 ++++++ 17 files changed, 103 insertions(+), 2 deletions(-) diff --git a/tbsetup/ipassign/dre/GNUmakefile b/tbsetup/ipassign/dre/GNUmakefile index 62c6f3a5af..83905abe8b 100644 --- a/tbsetup/ipassign/dre/GNUmakefile +++ b/tbsetup/ipassign/dre/GNUmakefile @@ -1,3 +1,8 @@ +# +# EMULAB-COPYRIGHT +# Copyright (c) 2005 University of Utah and the Flux Group. +# All rights reserved. +# all: test-heap graph2dot test-dijk test-dijk.opt test-dre test-dre.opt %.cmx: %.ml diff --git a/tbsetup/ipassign/dre/dijkstra.ml b/tbsetup/ipassign/dre/dijkstra.ml index 9ef612cefb..d505bd7c6a 100644 --- a/tbsetup/ipassign/dre/dijkstra.ml +++ b/tbsetup/ipassign/dre/dijkstra.ml @@ -3,6 +3,12 @@ * algorthm *) +(* + * EMULAB-COPYRIGHT + * Copyright (c) 2005 University of Utah and the Flux Group. + * All rights reserved. + *) + type ('a,'b) dijk_state = { graph : ('a, 'b) Graph.t; visited : bool array; (* Not yet used - ditch? *) diff --git a/tbsetup/ipassign/dre/dre.ml b/tbsetup/ipassign/dre/dre.ml index 14b5e8183f..8495ed5324 100644 --- a/tbsetup/ipassign/dre/dre.ml +++ b/tbsetup/ipassign/dre/dre.ml @@ -2,6 +2,12 @@ * Functions for computing DRE *) +(* + * EMULAB-COPYRIGHT + * Copyright (c) 2005 University of Utah and the Flux Group. + * All rights reserved. + *) + (* let compute_dre (graph : ('a, 'b) Graph.t) : float array array = *) let compute_dre (hops : ('a, 'b) Dijkstra.first_hop array array) : float array array = (* Initialize the array of results *) diff --git a/tbsetup/ipassign/dre/ga.ml b/tbsetup/ipassign/dre/ga.ml index 9933f3cf24..3a78814362 100644 --- a/tbsetup/ipassign/dre/ga.ml +++ b/tbsetup/ipassign/dre/ga.ml @@ -1,7 +1,11 @@ (* * Core of a genetic algorithm - * Copyright 2005 Robert Ricci for the University of Utah - * ricci@cs.utah.edu, testbed-ops@emulab.net + *) + +(* + * EMULAB-COPYRIGHT + * Copyright (c) 2005 University of Utah and the Flux Group. + * All rights reserved. *) type individual = int array;; diff --git a/tbsetup/ipassign/dre/graph.ml b/tbsetup/ipassign/dre/graph.ml index 7204bd441c..4f7dcee56f 100644 --- a/tbsetup/ipassign/dre/graph.ml +++ b/tbsetup/ipassign/dre/graph.ml @@ -3,6 +3,13 @@ * Note: tests are commented out, since this module gets included by other * files *) + +(* + * EMULAB-COPYRIGHT + * Copyright (c) 2005 University of Utah and the Flux Group. + * All rights reserved. + *) + type ('a, 'b) node = { node_contents : 'a; mutable node_edges : ('a, 'b) edge_list } and ('a, 'b) edge_list = ('a, 'b) edge list diff --git a/tbsetup/ipassign/dre/graph2dot.ml b/tbsetup/ipassign/dre/graph2dot.ml index b1b5244d29..510d1d1785 100644 --- a/tbsetup/ipassign/dre/graph2dot.ml +++ b/tbsetup/ipassign/dre/graph2dot.ml @@ -8,6 +8,12 @@ * ... verticies exist only implicitly, as referenced by edges. *) +(* + * EMULAB-COPYRIGHT + * Copyright (c) 2005 University of Utah and the Flux Group. + * All rights reserved. + *) + (* Hmm, this is awkward, I have to declare all of these types even though they * are related. There's probably some better way to do this *) type mygraph = (int, unit) Graph.t;; diff --git a/tbsetup/ipassign/dre/heap.ml b/tbsetup/ipassign/dre/heap.ml index 2cc68a8f69..e047e3aebb 100644 --- a/tbsetup/ipassign/dre/heap.ml +++ b/tbsetup/ipassign/dre/heap.ml @@ -1,6 +1,13 @@ (* * heap.ml - simple heap module *) + +(* + * EMULAB-COPYRIGHT + * Copyright (c) 2005 University of Utah and the Flux Group. + * All rights reserved. + *) + (* Types used by this module *) type location = int;; type weight = int;; diff --git a/tbsetup/ipassign/dre/test-dijk.ml b/tbsetup/ipassign/dre/test-dijk.ml index d5b2a8d2ca..a9312f6ddb 100644 --- a/tbsetup/ipassign/dre/test-dijk.ml +++ b/tbsetup/ipassign/dre/test-dijk.ml @@ -3,6 +3,12 @@ * Test functions for my Dijkstra's shortest path implementation *) +(* + * EMULAB-COPYRIGHT + * Copyright (c) 2005 University of Utah and the Flux Group. + * All rights reserved. + *) + (* Hmm, this is awkward, I have to declare all of these types even though they * are related. There's probably some better way to do this *) type mygraph = (int, int) Graph.t;; diff --git a/tbsetup/ipassign/dre/test-dre.ml b/tbsetup/ipassign/dre/test-dre.ml index 624a4da9e1..4d413fc586 100755 --- a/tbsetup/ipassign/dre/test-dre.ml +++ b/tbsetup/ipassign/dre/test-dre.ml @@ -3,6 +3,12 @@ * Test functions for my Dijkstra's shortest path implementation *) +(* + * EMULAB-COPYRIGHT + * Copyright (c) 2005 University of Utah and the Flux Group. + * All rights reserved. + *) + (* Hmm, this is awkward, I have to declare all of these types even though they * are related. There's probably some better way to do this *) type mygraph = (int, int) Graph.t;; diff --git a/tbsetup/ipassign/dre/test-heap.ml b/tbsetup/ipassign/dre/test-heap.ml index 4c0b9bf463..b1bc5280dd 100644 --- a/tbsetup/ipassign/dre/test-heap.ml +++ b/tbsetup/ipassign/dre/test-heap.ml @@ -1,3 +1,9 @@ +(* + * EMULAB-COPYRIGHT + * Copyright (c) 2005 University of Utah and the Flux Group. + * All rights reserved. + *) + type h = int Heap.heap;; let h1 = Heap.make_heap 0;; diff --git a/tbsetup/ipassign/src/CutSearchPartition.h b/tbsetup/ipassign/src/CutSearchPartition.h index ae8834d541..4b6ebac3fc 100644 --- a/tbsetup/ipassign/src/CutSearchPartition.h +++ b/tbsetup/ipassign/src/CutSearchPartition.h @@ -1,5 +1,11 @@ // CutSearchPartition.h +/* + * EMULAB-COPYRIGHT + * Copyright (c) 2004 University of Utah and the Flux Group. + * All rights reserved. + */ + #ifndef CUT_SEARCH_PARTITION_H_IP_ASSIGN_2 #define CUT_SEARCH_PARTITION_H_IP_ASSIGN_2 diff --git a/tbsetup/ipassign/src/GraphConverter.h b/tbsetup/ipassign/src/GraphConverter.h index f22e34753b..d3b69e7c6c 100644 --- a/tbsetup/ipassign/src/GraphConverter.h +++ b/tbsetup/ipassign/src/GraphConverter.h @@ -1,5 +1,11 @@ // GraphConverter.h +/* + * EMULAB-COPYRIGHT + * Copyright (c) 2004 University of Utah and the Flux Group. + * All rights reserved. + */ + #ifndef GRAPH_CONVERTER_H_IP_ASSIGN_2 #define GRAPH_CONVERTER_H_IP_ASSIGN_2 diff --git a/tbsetup/ipassign/src/RatioCutPartition.h b/tbsetup/ipassign/src/RatioCutPartition.h index 62e979712a..877f4a4b4b 100644 --- a/tbsetup/ipassign/src/RatioCutPartition.h +++ b/tbsetup/ipassign/src/RatioCutPartition.h @@ -1,5 +1,11 @@ // RatioCutPartition.h +/* + * EMULAB-COPYRIGHT + * Copyright (c) 2004 University of Utah and the Flux Group. + * All rights reserved. + */ + #ifndef RATIO_CUT_PARTITION_H_IP_ASSIGN_2 #define RATIO_CUT_PARTITION_H_IP_ASSIGN_2 diff --git a/tbsetup/ipassign/src/add-x.cc b/tbsetup/ipassign/src/add-x.cc index e83162a5a0..8d4c79e970 100644 --- a/tbsetup/ipassign/src/add-x.cc +++ b/tbsetup/ipassign/src/add-x.cc @@ -1,5 +1,11 @@ // add-x.cc +/* + * EMULAB-COPYRIGHT + * Copyright (c) 2004 University of Utah and the Flux Group. + * All rights reserved. + */ + #include <iostream> using namespace std; diff --git a/tbsetup/ipassign/src/difference.cc b/tbsetup/ipassign/src/difference.cc index 69f8705bfe..44860cd1dc 100644 --- a/tbsetup/ipassign/src/difference.cc +++ b/tbsetup/ipassign/src/difference.cc @@ -1,5 +1,11 @@ // difference.cc +/* + * EMULAB-COPYRIGHT + * Copyright (c) 2004 University of Utah and the Flux Group. + * All rights reserved. + */ + #include <iostream> #include <fstream> #include <string> diff --git a/tbsetup/ipassign/src/graph2single-source.cc b/tbsetup/ipassign/src/graph2single-source.cc index 67abef710a..729b2d902e 100644 --- a/tbsetup/ipassign/src/graph2single-source.cc +++ b/tbsetup/ipassign/src/graph2single-source.cc @@ -1,5 +1,11 @@ // graph2single-source.cc +/* + * EMULAB-COPYRIGHT + * Copyright (c) 2004 University of Utah and the Flux Group. + * All rights reserved. + */ + #include <iostream> #include <string> #include <sstream> diff --git a/tbsetup/ipassign/src/route2dist.cc b/tbsetup/ipassign/src/route2dist.cc index 62e1be1bf9..42e92efe0a 100644 --- a/tbsetup/ipassign/src/route2dist.cc +++ b/tbsetup/ipassign/src/route2dist.cc @@ -1,5 +1,11 @@ // route2dist.cc +/* + * EMULAB-COPYRIGHT + * Copyright (c) 2004 University of Utah and the Flux Group. + * All rights reserved. + */ + #include <iostream> #include <sstream> #include <string> -- GitLab