Skip to content

Commit

Permalink
Standardize copyright comments (#2185)
Browse files Browse the repository at this point in the history
* Add copyright comments to all files, fix existing ones

* Undo accidental changes

* Update ezexample.h

* add revised
  • Loading branch information
jackgerrits committed Dec 9, 2019
1 parent cb914a0 commit f83c0e3
Show file tree
Hide file tree
Showing 261 changed files with 926 additions and 855 deletions.
8 changes: 3 additions & 5 deletions cs/cli/clr_io.cpp
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.
#define NOMINMAX
#include <msclr\marshal_cppstd.h>
#include "clr_io.h"
Expand Down
8 changes: 3 additions & 5 deletions cs/cli/clr_io.h
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#include "io_buf.h"

Expand Down
10 changes: 4 additions & 6 deletions cs/cli/clr_io_memory.cpp
@@ -1,10 +1,8 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#include "clr_io_memory.h"
#include "clr_io_memory.h"
#include <algorithm>

namespace VW
Expand Down
8 changes: 3 additions & 5 deletions cs/cli/clr_io_memory.h
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#include "io_buf.h"

Expand Down
8 changes: 3 additions & 5 deletions cs/cli/spanning_tree_clr.cpp
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#include "spanning_tree_clr.h"
#include "vw_clr.h"
Expand Down
9 changes: 3 additions & 6 deletions cs/cli/spanning_tree_clr.h
@@ -1,9 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/

// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.
#pragma once

#include "spanning_tree.h"
Expand Down
14 changes: 6 additions & 8 deletions cs/cli/vowpalwabbit.cpp
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#include "vw_clr.h"
#include "vowpalwabbit.h"
Expand Down Expand Up @@ -697,11 +695,11 @@ uint64_t hashall(String^ s, int offset, int count, uint64_t u)
k1 = (uint32_t)(keys[i] | keys[i + 1] << 8 | keys[i + 2] << 16 | keys[i + 3] << 24);

k1 *= c1;
k1 = rotl32(k1, 15);
k1 = rotl32(k1, 15);
k1 *= c2;

h1 ^= k1;
h1 = rotl32(h1, 13);
h1 = rotl32(h1, 13);
h1 = h1 * 5 + 0xe6546b64;

i += 4;
Expand All @@ -717,7 +715,7 @@ uint64_t hashall(String^ s, int offset, int count, uint64_t u)
case 1:
k1 ^= (uint32_t)(keys[tail]);
k1 *= c1;
k1 = rotl32(k1, 15);
k1 = rotl32(k1, 15);
k1 *= c2;
h1 ^= k1;
break;
Expand Down
10 changes: 4 additions & 6 deletions cs/cli/vowpalwabbit.h
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#pragma once

Expand Down Expand Up @@ -174,7 +172,7 @@ public ref class VowpalWabbit : VowpalWabbitBase, IVowpalWabbitExamplePool
/// </summary>
/// <param name="examples">Example to learn from.</param>
void Learn(List<VowpalWabbitExample^>^ examples);

/// <summary>
/// Predicts for the given example.
/// </summary>
Expand Down
8 changes: 3 additions & 5 deletions cs/cli/vw_arguments.h
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#pragma once

Expand Down
8 changes: 3 additions & 5 deletions cs/cli/vw_base.h
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#pragma once

Expand Down
8 changes: 3 additions & 5 deletions cs/cli/vw_builder.cpp
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#include "vw_builder.h"
#include "parser.h"
Expand Down
8 changes: 3 additions & 5 deletions cs/cli/vw_builder.h
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#pragma once

Expand Down
8 changes: 3 additions & 5 deletions cs/cli/vw_cbutil.cpp
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#include "vw_cbutil.h"
#include "cb_algs.h"
Expand Down
8 changes: 3 additions & 5 deletions cs/cli/vw_cbutil.h
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#pragma once

Expand Down
8 changes: 3 additions & 5 deletions cs/cli/vw_clr.h
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#pragma once

Expand Down
8 changes: 3 additions & 5 deletions cs/cli/vw_example.cpp
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#include "vowpalwabbit.h"
#include "vw_example.h"
Expand Down
8 changes: 3 additions & 5 deletions cs/cli/vw_example.h
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#pragma once

Expand Down
8 changes: 3 additions & 5 deletions cs/cli/vw_exception.cpp
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#include "vw_clr.h"

Expand Down
10 changes: 4 additions & 6 deletions cs/cli/vw_interface.h
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#pragma once

Expand All @@ -19,7 +17,7 @@ ref class VowpalWabbitBase;
/// Owners of example must implement this interface.
/// </summary>
public interface class IVowpalWabbitExamplePool : public System::IDisposable
{
{
/// <summary>
/// Gets or creates a new native examples.
/// </summary>
Expand Down
8 changes: 3 additions & 5 deletions cs/cli/vw_label.h
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#pragma once

Expand Down
8 changes: 3 additions & 5 deletions cs/cli/vw_labelcomparator.h
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#pragma once

Expand Down
8 changes: 3 additions & 5 deletions cs/cli/vw_model.cpp
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#include "vw_clr.h"
#include "vw_model.h"
Expand Down
8 changes: 3 additions & 5 deletions cs/cli/vw_model.h
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#pragma once

Expand Down
8 changes: 3 additions & 5 deletions cs/cli/vw_prediction.cpp
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#include "vw_prediction.h"
#include "vw_example.h"
Expand Down
10 changes: 4 additions & 6 deletions cs/cli/vw_prediction.h
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#pragma once

Expand Down Expand Up @@ -385,4 +383,4 @@ public ref class VowpalWabbitPredictionType sealed abstract
/// </summary>
static initonly VowpalWabbitMulticlassProbabilitiesPredictionFactory^ MultiClassProbabilities = gcnew VowpalWabbitMulticlassProbabilitiesPredictionFactory;
};
}
}
10 changes: 4 additions & 6 deletions cs/cli/vw_settings.h
@@ -1,8 +1,6 @@
/*
Copyright (c) by respective owners including Yahoo!, Microsoft, and
individual contributors. All rights reserved. Released under a BSD (revised)
license as described in the file LICENSE.
*/
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#pragma once

Expand All @@ -21,7 +19,7 @@ ref class VowpalWabbitModel;
ref class VowpalWabbitSettings;

public enum class VowpalWabbitExampleDistribution
{
{
/// <summary>
/// Statistically safer option.
/// </summary>
Expand Down
4 changes: 4 additions & 0 deletions python/pylibvw.cc
@@ -1,3 +1,7 @@
// Copyright (c) by respective owners including Yahoo!, Microsoft, and
// individual contributors. All rights reserved. Released under a BSD (revised)
// license as described in the file LICENSE.

#include "../vowpalwabbit/vw.h"

#include "../vowpalwabbit/multiclass.h"
Expand Down
4 changes: 2 additions & 2 deletions test/train-sets/ref/malformed-onethread-strict_parse.stderr
Expand Up @@ -7,7 +7,7 @@ Reading datafile = train-sets/malformed.dat
num sources = 1
average since example example current current current
loss last counter weight label predict features
vw example #0(parse_example.cc:85): malformed example! '|',space, or EOL expected after : "| x:0.7"in Example #0: "| x:0.7"
vw example #0(parse_example.cc:83): malformed example! '|',space, or EOL expected after : "| x:0.7"in Example #0: "| x:0.7"

vw (parse_example.cc:85): malformed example! '|',space, or EOL expected after : "| x:0.7"in Example #0: "| x:0.7"
vw (parse_example.cc:83): malformed example! '|',space, or EOL expected after : "| x:0.7"in Example #0: "| x:0.7"

0 comments on commit f83c0e3

Please sign in to comment.